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

[Ashod Nakashian]

 loolwsd/DocumentBroker.cpp |    5 +++--
 loolwsd/TileCache.cpp      |    4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit cd8d48e6bb78cb616e63da3bd37d0dfb39967ff3
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date:   Wed May 4 22:05:09 2016 -0400

    loolwsd: tile logs
    
    Change-Id: Id5c8b688c36038dc6f02ad95ad1c43412dcd2c31
    Reviewed-on: https://gerrit.libreoffice.org/24668
    Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
    Tested-by: Ashod Nakashian <ashnak...@gmail.com>

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index e3b2b0e..040e7b0 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -409,7 +409,7 @@ void DocumentBroker::handleTileRequest(int part, int width, 
int height, int tile
 
     std::unique_lock<std::mutex> lock(_mutex);
 
-    std::unique_ptr<std::fstream> cachedTile = tileCache().lookupTile(part, 
width, height, tilePosX, tilePosY, tileWidth, tileHeight);
+    std::unique_ptr<std::fstream> cachedTile = _tileCache->lookupTile(part, 
width, height, tilePosX, tilePosY, tileWidth, tileHeight);
 
     if (cachedTile)
     {
@@ -442,9 +442,10 @@ void DocumentBroker::handleTileRequest(int part, int 
width, int height, int tile
             tileHeight, session))
         return;
 
+    Log::debug() << "Sending render request for tile (" << part << ',' << 
tilePosX << ',' << tilePosY << ")." << Log::end;
+
     // Forward to child to render.
     const std::string request = "tile " + tileMsg;
-
     _childProcess->getWebSocket()->sendFrame(request.data(), request.size());
 }
 
diff --git a/loolwsd/TileCache.cpp b/loolwsd/TileCache.cpp
index bdf726e..3242344 100644
--- a/loolwsd/TileCache.cpp
+++ b/loolwsd/TileCache.cpp
@@ -377,7 +377,7 @@ bool TileCache::isTileBeingRenderedIfSoSubscribe(int part, 
int width, int height
 
     if (tileBeingRendered)
     {
-        Log::debug("Tile is already being rendered, subscribing");
+        Log::debug() << "Tile (" << part << ',' << tilePosX << ',' << tilePosY 
<< ") is already being rendered, subscribing." << Log::end;
         assert(subscriber->getKind() == LOOLSession::Kind::ToClient);
 
         for (const auto &s : tileBeingRendered->_subscribers)
@@ -394,6 +394,8 @@ bool TileCache::isTileBeingRenderedIfSoSubscribe(int part, 
int width, int height
     }
     else
     {
+        Log::debug() << "Tile (" << part << ',' << tilePosX << ',' << tilePosY 
<< ") needs rendering, subscribing." << Log::end;
+
         const std::string cachedName = cacheFileName(part, width, height, 
tilePosX, tilePosY, tileWidth, tileHeight);
 
         assert(_tilesBeingRendered.find(cachedName) == 
_tilesBeingRendered.end());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits