desktop/source/lib/init.cxx | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
New commits:
commit bf3cfa0256c37e0ac6db5066c731b1a3f2291407
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
AuthorDate: Sun May 5 12:35:42 2019 -0400
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jul 25 09:24:56 2019 +0200
LOK: trace queue only when it is changed
Change-Id: I9b8e060c2c7655565b95004d82bf50ada2ed0d08
Reviewed-on: https://gerrit.libreoffice.org/71845
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/76267
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 68bbe7713cce..157ca969660e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -981,22 +981,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)
@@ -1426,6 +1411,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())
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
