[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configmgr/source configure.ac solenv/gbuild

[Tor Lillqvist]

 config_host.mk.in                 |    1 +
 configmgr/source/parsemanager.cxx |    5 ++++-
 configmgr/source/parsemanager.hxx |    1 +
 configure.ac                      |    9 +++++++++
 solenv/gbuild/gbuild.mk           |    6 ++++++
 5 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 6addde24f43d4d77cd459ef1d34df84cdad49d8f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 23 12:58:56 2014 +0300

    Add --enable-sal-info
    
    Change-Id: I014d70ace7ce34b804ea2a018d3de8f94f7e0cbc

diff --git a/config_host.mk.in b/config_host.mk.in
index e55b3f5..4de9201 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -165,6 +165,7 @@ export ENABLE_RANDR=@ENABLE_RANDR@
 export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@
 export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@
 export ENABLE_RUNTIME_OPTIMIZATIONS=@ENABLE_RUNTIME_OPTIMIZATIONS@
+export ENABLE_SAL_INFO=@ENABLE_SAL_INFO@
 export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@
 export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@
 export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@
diff --git a/configure.ac b/configure.ac
index 9507847..a72e4a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1015,6 +1015,10 @@ AC_ARG_ENABLE(debug,
         [Include debugging information, disable compiler optimization and inlining plus
          extra debugging code like assertions. Extra large build! (enables -g compiler flag).]))
 
+AC_ARG_ENABLE(sal-info,
+    AS_HELP_STRING([--enable-sal-info],
+        [Make SAL_INFO and SAL_WARN calls do something even in a non-debug build.]))
+
 AC_ARG_ENABLE(selective-debuginfo,
     AS_HELP_STRING([--enable-selective-debuginfo],
         [If --enable-debug or --enable-dbgutil is used, build debugging information
@@ -3801,6 +3805,11 @@ AC_SUBST(ENABLE_DEBUG)
 AC_SUBST(ANDROID_DEBUGGABLE)
 AC_SUBST(ANDROID_INSTALL_LOCATION)
 
+if test "$enable_sal_info" = yes; then
+    ENABLE_SAL_INFO=TRUE
+fi
+AC_SUBST(ENABLE_SAL_INFO)
+
 dnl Selective debuginfo
 ENABLE_DEBUGINFO_FOR=
 if test -n "$ENABLE_DEBUG"; then
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 294c7d1..5c02a19 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -239,6 +239,12 @@ gb_GLOBALDEFS += -DNDEBUG \
 
 endif
 
+ifeq ($(ENABLE_SAL_INFO),TRUE)
+gb_GLOBALDEFS += -DSAL_LOG_INFO \
+				 -DSAL_LOG_WARN \
+
+endif
+
 else
 gb_GLOBALDEFS += -DSAL_LOG_INFO \
 				 -DSAL_LOG_WARN \
commit 2593d96b8d03fd1d4f17b05882a09687c47471c5
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 23 12:31:58 2014 +0300

    Log parsing time of each xcd file
    
    Change-Id: I290e2c84b17b9b5063139c6027b72f6cd3a78a99

diff --git a/configmgr/source/parsemanager.cxx b/configmgr/source/parsemanager.cxx
index fcbb190..008f2bf 100644
--- a/configmgr/source/parsemanager.cxx
+++ b/configmgr/source/parsemanager.cxx
@@ -35,7 +35,7 @@ namespace configmgr {
 
 ParseManager::ParseManager(
     OUString const & url, rtl::Reference< Parser > const & parser)
-   : reader_(url), parser_(parser), itemNamespaceId_(-1)
+   : url_(url), reader_(url), parser_(parser), itemNamespaceId_(-1)
 {
     assert(parser.is());
     int id;
@@ -56,6 +56,7 @@ ParseManager::ParseManager(
 }
 
 bool ParseManager::parse(std::set< OUString > const * existingDependencies) {
+    sal_uInt32 startTime( osl_getGlobalTimer() );
     for (;;) {
         switch (itemData_.is()
                 ? xmlreader::XmlReader::RESULT_BEGIN
@@ -66,6 +67,7 @@ bool ParseManager::parse(std::set< OUString > const * existingDependencies) {
             if (!parser_->startElement(
                     reader_, itemNamespaceId_, itemData_, existingDependencies))
             {
+                SAL_INFO("configmgr", "parsing " << url_ << " took " << (osl_getGlobalTimer() - startTime) << " ms, fail");
                 return false;
             }
             break;
@@ -76,6 +78,7 @@ bool ParseManager::parse(std::set< OUString > const * existingDependencies) {
             parser_->characters(itemData_);
             break;
         case xmlreader::XmlReader::RESULT_DONE:
+            SAL_INFO("configmgr", "parsing " << url_ << " took " << (osl_getGlobalTimer() - startTime) << " ms, success");
             return true;
         }
         itemData_.clear();
diff --git a/configmgr/source/parsemanager.hxx b/configmgr/source/parsemanager.hxx
index 85ed3c5..74fa131 100644
--- a/configmgr/source/parsemanager.hxx
+++ b/configmgr/source/parsemanager.hxx
@@ -47,6 +47,7 @@ public:
     enum { NAMESPACE_OOR = 1, NAMESPACE_XS = 2, NAMESPACE_XSI = 3 };
 
 private:
+    OUString url_;
     virtual ~ParseManager();
 
     xmlreader::XmlReader reader_;