wsd/LOOLWSD.cpp | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
New commits:
commit 70bbc53d86a8fc13f3fe13ec3e1aa24379b10ed0
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Wed Dec 21 10:33:48 2016 -0500
wsd: don't reuse DocBrokers iterator to insert
Simplifies the code and makes it less error prone.
Also add more logging on modifying DocBrokers.
Change-Id: I861495912eb4994a32b1ccaccc181fb1aad26e1f
Reviewed-on: https://gerrit.libreoffice.org/32295
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 33d70c1..8ac073f 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -281,7 +281,18 @@ bool cleanupDocBrokers()
}
}
- return (count != DocBrokers.size());
+ if (count != DocBrokers.size())
+ {
+ LOG_TRC("Have " << DocBrokers.size() << " DocBrokers after cleanup.");
+ for (auto& pair : DocBrokers)
+ {
+ LOG_TRC("DocumentBroker [" << pair.first << "].");
+ }
+
+ return true;
+ }
+
+ return false;
}
static void forkChildren(const int number)
@@ -556,6 +567,7 @@ private:
// FIXME: What if the same document is already open? Need
a fake dockey here?
LOG_DBG("New DocumentBroker for docKey [" << docKey <<
"].");
DocBrokers.emplace(docKey, docBroker);
+ LOG_TRC("Have " << DocBrokers.size() << " DocBrokers after
inserting.");
// Load the document.
std::shared_ptr<LOOLWebSocket> ws;
@@ -612,6 +624,7 @@ private:
LOG_DBG("Removing DocumentBroker for docKey [" <<
docKey << "].");
DocBrokers.erase(docKey);
docBroker->terminateChild(docLock);
+ LOG_TRC("Have " << DocBrokers.size() << " DocBrokers
after removing.");
}
else
{
@@ -772,11 +785,11 @@ private:
cleanupDocBrokers();
// Lookup this document.
- auto it = DocBrokers.lower_bound(docKey);
- if (it != DocBrokers.end() && it->first == docKey)
+ auto it = DocBrokers.find(docKey);
+ if (it != DocBrokers.end())
{
// Get the DocumentBroker from the Cache.
- LOG_DBG("Found DocumentBroker for docKey [" << docKey << "].");
+ LOG_DBG("Found DocumentBroker with docKey [" << docKey << "].");
docBroker = it->second;
assert(docBroker);
@@ -828,8 +841,8 @@ private:
// Retake the lock and recheck if another thread created the
DocBroker.
docBrokersLock.lock();
- it = DocBrokers.lower_bound(docKey);
- if (it != DocBrokers.end() && it->first == docKey)
+ it = DocBrokers.find(docKey);
+ if (it != DocBrokers.end())
{
// Get the DocumentBroker from the Cache.
LOG_DBG("Found DocumentBroker for docKey [" << docKey <<
"].");
@@ -840,6 +853,7 @@ private:
}
Util::assertIsLocked(docBrokersLock);
+ LOG_DBG("No DocumentBroker with docKey [" << docKey << "] found. New
Child and Document.");
if (TerminationFlag)
{
@@ -871,7 +885,8 @@ private:
LOG_DBG("New DocumentBroker for docKey [" << docKey << "].");
docBroker = std::make_shared<DocumentBroker>(uriPublic, docKey,
LOOLWSD::ChildRoot, child);
child->setDocumentBroker(docBroker);
- DocBrokers.insert(it, std::make_pair(docKey, docBroker));
+ DocBrokers.emplace(docKey, docBroker);
+ LOG_TRC("Have " << DocBrokers.size() << " DocBrokers after
inserting.");
}
// Validate the broker.
@@ -992,6 +1007,7 @@ private:
LOG_INF("Removing DocumentBroker for docKey [" <<
docKey << "].");
DocBrokers.erase(docKey);
docBroker->terminateChild(lock);
+ LOG_TRC("Have " << DocBrokers.size() << " DocBrokers
after removing.");
}
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
