summaryrefslogtreecommitdiff
path: root/test/WhiteBoxTests.cpp
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2019-07-18 12:00:58 +0300
committerJan Holesovsky <kendy@collabora.com>2019-07-24 12:09:24 +0200
commitf7a70ba9d3411953ca4147ac8cc484dd8745b5b7 (patch)
tree7fa5172bce847a8439c58994409f8fb2e4bb227a /test/WhiteBoxTests.cpp
parent3dd8364056fc0cf5625c44b688e9cbf58e95e90b (diff)
tdf#125681: Get rid of ChildSession::getDocumentMutex() and associated code
Now with the "Unipoll" concept all this locking is unnecessary as the kit process is single-threaded, and actually it is harmful as the bug shows. Michael explains in chat: But in fact - we should be a single threaded kit process there now. We are protected by the solar-mutex (which is recursive) while our locking is not. This was the whole point of the Unipoll refactor: to remove the extra threads, complex queues, etc. etc. I just left the mutexes. Even a recursive mutex won't work there; since it needs to be drop-able and transferable to another (LOK internal thread) in Yield, so - we should remove them. Change-Id: I7d1e1dfb0e20f14134be5f81da057539b0f86ab9 Reviewed-on: https://gerrit.libreoffice.org/75849 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'test/WhiteBoxTests.cpp')
-rw-r--r--test/WhiteBoxTests.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/test/WhiteBoxTests.cpp b/test/WhiteBoxTests.cpp
index 21ca04bd1..38bb627d0 100644
--- a/test/WhiteBoxTests.cpp
+++ b/test/WhiteBoxTests.cpp
@@ -542,11 +542,6 @@ public:
return _mutex;
}
- std::mutex& getDocumentMutex() override
- {
- return _mutex;
- }
-
std::string getObfuscatedFileId() override
{
return std::string();