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

[Ashod Nakashian]

 wsd/DocumentBroker.cpp |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit bd00aa405727ae193c6ae762ce0efd9b580043ae
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sat Mar 25 13:57:08 2017 -0400

    wsd: assert isCorrectThread
    
    Change-Id: I90bfa9ba6b47e657db28a3680fa8a13ef2553a6e
    Reviewed-on: https://gerrit.libreoffice.org/35703
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 2f7ab961..2f542b14 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -302,7 +302,7 @@ DocumentBroker::~DocumentBroker()
 
 bool DocumentBroker::load(const std::shared_ptr<ClientSession>& session, const std::string& jailId)
 {
-    Util::assertIsLocked(_mutex);
+    assert(isCorrectThread());
 
     const std::string sessionId = session->getId();
 
@@ -519,7 +519,7 @@ bool DocumentBroker::saveToStorage(const std::string& sessionId,
 bool DocumentBroker::saveToStorageInternal(const std::string& sessionId,
                                            bool success, const std::string& result)
 {
-    assert(_poll->isCorrectThread());
+    assert(isCorrectThread());
 
     // If save requested, but core didn't save because document was unmodified
     // notify the waiting thread, if any.
@@ -745,7 +745,7 @@ size_t DocumentBroker::queueSession(std::shared_ptr<ClientSession>& session)
 
 size_t DocumentBroker::addSession(const std::shared_ptr<ClientSession>& session)
 {
-    Util::assertIsLocked(_mutex);
+    assert(isCorrectThread());
 
     try
     {
@@ -948,6 +948,7 @@ void DocumentBroker::invalidateTiles(const std::string& tiles)
 void DocumentBroker::handleTileRequest(TileDesc& tile,
                                        const std::shared_ptr<ClientSession>& session)
 {
+    assert(isCorrectThread());
     std::unique_lock<std::mutex> lock(_mutex);
 
     tile.setVersion(++_tileVersion);
@@ -1213,6 +1214,8 @@ bool DocumentBroker::forwardToChild(const std::string& viewId, const std::string
 
 bool DocumentBroker::forwardToClient(const std::shared_ptr<Message>& payload)
 {
+    assert(isCorrectThread());
+
     const std::string& msg = payload->abbr();
     const std::string& prefix = payload->forwardToken();
     LOG_TRC("Forwarding payload to [" << prefix << "]: " << msg);
@@ -1224,8 +1227,6 @@ bool DocumentBroker::forwardToClient(const std::shared_ptr<Message>& payload)
         const auto& data = payload->data().data();
         const auto& size = payload->size();
 
-        // std::unique_lock<std::mutex> lock(_mutex);
-
         if (sid == "all")
         {
             // Broadcast to all.