[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp wsd/TileCache.cpp

2019-04-22 Thread Libreoffice Gerrit user 
 wsd/DocumentBroker.cpp |4 ++--
 wsd/TileCache.cpp  |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ca1a83f96b013e171130596dd1486b1416ddbea3
Author: Ashod Nakashian 
AuthorDate: Mon Apr 22 12:03:49 2019 -0400
Commit: Ashod Nakashian 
CommitDate: Tue Apr 23 03:02:36 2019 +0200

wsd: reduce tile logging from debug to trace level

These are very frequent and not very useful without
the ability to trace them across the system, which
are all done at trace level. So it's highly unlikely
that these would be used at debug.

Change-Id: I479f2ead1bbd2996b9972082e00ebf984072f785
Reviewed-on: https://gerrit.libreoffice.org/71073
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 53d3e2dbe..40465c0ce 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1395,7 +1395,7 @@ void 
DocumentBroker::handleTileCombinedRequest(TileCombined& tileCombined,
 
 // Forward to child to render.
 const std::string req = newTileCombined.serialize("tilecombine");
-LOG_DBG("Sending residual tilecombine: " << req);
+LOG_TRC("Sending uncached residual tilecombine request to Kit: " << 
req);
 _childProcess->sendTextFrame(req);
 }
 
@@ -1527,7 +1527,7 @@ void DocumentBroker::sendRequestedTiles(const 
std::shared_ptr& se
 
 // Forward to child to render.
 const std::string req = newTileCombined.serialize("tilecombine");
-LOG_DBG("Some of the tiles were not prerendered. Sending residual 
tilecombine: " << req);
+LOG_TRC("Some of the tiles were not prerendered. Sending residual 
tilecombine: " << req);
 _childProcess->sendTextFrame(req);
 }
 }
diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp
index 287e0ba77..a4f16a5f0 100644
--- a/wsd/TileCache.cpp
+++ b/wsd/TileCache.cpp
@@ -311,7 +311,7 @@ void TileCache::invalidateTiles(int part, int x, int y, int 
width, int height)
 {
 if (intersectsTile(it->first, part, x, y, width, height))
 {
-LOG_DBG("Removing tile: " << it->first.serialize());
+LOG_TRC("Removing tile: " << it->first.serialize());
 it = _cache.erase(it);
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp wsd/TileCache.cpp wsd/TileCache.hpp

2019-02-15 Thread Libreoffice Gerrit user 
 wsd/DocumentBroker.cpp |1 +
 wsd/TileCache.cpp  |   14 ++
 wsd/TileCache.hpp  |4 ++--
 3 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 150d20cf37b2aa6112b13f73cf67b466f8a64975
Author: Michael Meeks 
AuthorDate: Fri Feb 15 20:42:00 2019 +0100
Commit: Michael Meeks 
CommitDate: Fri Feb 15 21:36:28 2019 +0100

TileCache: dumpState.

Change-Id: I6289f0b77eb0649be8254aa8c9647c47d4db3008

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 2239079e6..e615b6d04 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1888,6 +1888,7 @@ void DocumentBroker::dumpState(std::ostream& os)
 os << "\n  last saved: " << std::ctime();
 os << "\n  cursor " << _cursorPosX << ", " << _cursorPosY
   << "( " << _cursorWidth << "," << _cursorHeight << ")\n";
+_tileCache->dumpState(os);
 
 _poll->dumpState(os);
 }
diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp
index e87fe9214..a5dae27c6 100644
--- a/wsd/TileCache.cpp
+++ b/wsd/TileCache.cpp
@@ -559,4 +559,18 @@ TileCache::Tile TileCache::loadTile(const std::string 
)
 return TileCache::Tile();
 }
 
+void TileCache::dumpState(std::ostream& os)
+{
+size_t num = 0, size = 0;
+for (auto it : _cache)
+{
+num++; size += it.second->size();
+}
+os << "  tile cache: num: " << num << " size: " << size << " bytes\n";
+for (auto it : _cache)
+{
+os << "" /* << std::setw(4) << it.first->getWireId() */ << " - '" 
<< it.first << "' - " << it.second->size() << " bytes\n";
+}
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/wsd/TileCache.hpp b/wsd/TileCache.hpp
index 9f847fc5d..fe5a7ca34 100644
--- a/wsd/TileCache.hpp
+++ b/wsd/TileCache.hpp
@@ -91,11 +91,11 @@ public:
 bool hasTileBeingRendered(const TileDesc& tile);
 int getTileBeingRenderedVersion(const TileDesc& tile);
 
+// Debugging bits ...
+void dumpState(std::ostream& os);
 void setThreadOwner(const std::thread::id ) { _owner = id; }
 void assertCorrectThread();
 
-
-
 private:
 void invalidateTiles(int part, int x, int y, int width, int height);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp wsd/TileCache.cpp

2017-04-04 Thread Ashod Nakashian 
 wsd/DocumentBroker.cpp |8 
 wsd/TileCache.cpp  |3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 2254b71682a7314c1113ce4aa521de786d1d69c1
Author: Ashod Nakashian 
Date:   Wed Apr 5 00:26:09 2017 -0400

wsd: some informative logging

Change-Id: I4338f5bd8056d1d66da01efaa1a1fe54f8717793
Reviewed-on: https://gerrit.libreoffice.org/36116
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 97626af9..cafbd424 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -243,6 +243,10 @@ void DocumentBroker::pollThread()
 }
 }
 
+LOG_INF("Finished polling doc [" << _docKey << "]. stop: " << _stop << ", 
continuePolling: " <<
+_poll->continuePolling() << ", TerminationFlag: " << 
TerminationFlag <<
+", ShutdownRequestFlag: " << ShutdownRequestFlag << ".");
+
 // Terminate properly while we can.
 //TODO: pass some sensible reason.
 terminateChild("", false);
@@ -839,6 +843,10 @@ size_t DocumentBroker::removeSessionInternal(const 
std::string& id)
 LOG_TRC("Removed " << (readonly ? "readonly" : "non-readonly") <<
 " session [" << id << "] from docKey [" <<
 _docKey << "] to have " << count << " sessions.");
+for (const auto& pair : _sessions)
+{
+LOG_TRC("Session: " << pair.second->getName());
+}
 
 // Let the child know the client has disconnected.
 const std::string msg("child-" + id + " disconnect");
diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp
index 4c1d7572..b744eded 100644
--- a/wsd/TileCache.cpp
+++ b/wsd/TileCache.cpp
@@ -53,7 +53,8 @@ TileCache::TileCache(const std::string& docURL,
 _cacheDir(cacheDir)
 {
 LOG_INF("TileCache ctor for uri [" << _docURL <<
-"] modifiedTime=" << (modifiedTime.raw()/100) <<
+"], cacheDir: [" << _cacheDir <<
+"], modifiedTime=" << (modifiedTime.raw()/100) <<
 " getLastModified()=" << (getLastModified().raw()/100));
 File directory(_cacheDir);
 std::string unsaved;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits