[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - desktop/source

[Ashod Nakashian (via logerrit)]

 desktop/source/lib/init.cxx |   32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 79dbfbec29714ec50a8741b6e8065073fd30d075
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun May 5 12:35:42 2019 -0400
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon May 6 15:22:32 2019 +0200

    LOK: trace queue only when it is changed
    
    Change-Id: I9b8e060c2c7655565b95004d82bf50ada2ed0d08
    Reviewed-on: https://gerrit.libreoffice.org/71845
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 52b7f399c38b..c5bf038e14a3 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -965,22 +965,7 @@ void CallbackFlushHandler::queue(const int type, const char* data)
 
     CallbackData aCallbackData(type, (data ? data : "(nil)"));
     const std::string& payload = aCallbackData.PayloadString;
-    SAL_INFO("lok", "Queue: " << type << " : " << payload);
-
-#ifdef DBG_UTIL
-    {
-        // Dump the queue state and validate cached data.
-        int i = 1;
-        std::ostringstream oss;
-        oss << '\n';
-        for (const CallbackData& c : m_queue)
-            oss << i++ << ": [" << c.Type << "] [" << c.PayloadString << "].\n";
-        const std::string aQueued = oss.str();
-        SAL_INFO("lok", "Current Queue: " << (aQueued.empty() ? "Empty" : aQueued));
-        for (const CallbackData& c : m_queue)
-            assert(c.validate());
-    }
-#endif
+    SAL_INFO("lok", "Queue: [" << type << "]: [" << payload << "] on " << m_queue.size() << " entries.");
 
     bool bIsChartActive = false;
     if (type == LOK_CALLBACK_GRAPHIC_SELECTION)
@@ -1414,6 +1399,21 @@ void CallbackFlushHandler::queue(const int type, const char* data)
     SAL_INFO("lok", "Queued #" << (m_queue.size() - 1) <<
              " [" << type << "]: [" << payload << "] to have " << m_queue.size() << " entries.");
 
+#ifdef DBG_UTIL
+    {
+        // Dump the queue state and validate cached data.
+        int i = 1;
+        std::ostringstream oss;
+        oss << '\n';
+        for (const CallbackData& c : m_queue)
+            oss << i++ << ": [" << c.Type << "] [" << c.PayloadString << "].\n";
+        const std::string aQueued = oss.str();
+        SAL_INFO("lok", "Current Queue: " << (aQueued.empty() ? "Empty" : aQueued));
+        for (const CallbackData& c : m_queue)
+            assert(c.validate());
+    }
+#endif
+
     lock.unlock();
     if (!IsActive())
     {