strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

loolwsd: Give editlock correctly when adding a new session

Browse source 
This should be given to first editable(non-readonly) session.

Change-Id: I3b6e53df4b2450cc799c4b4e6a800f662d90a2c1
This commit is contained in:
Pranav Kant 2016-07-11 10:01:11 +05:30
parent 1265032896
commit 06dc3fd1bc
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
loolwsd/DocumentBroker.cpp
View file

@ -113,6 +113,7 @@ DocumentBroker::DocumentBroker(const Poco::URI& uriPublic,
_cursorPosY(0),
_isLoaded(false),
_isModified(false),
_isEditLockHeld(false),
_tileVersion(0)
{
assert(!_docKey.empty());
@ -345,12 +346,11 @@ size_t DocumentBroker::addSession(std::shared_ptr<ClientSession>& session)
{
Log::debug("Adding a readonly session [" + id + "]");
}
// TODO: Below is not always true. What if readonly session is already opened
// In that case we still have to give edit lock to this *second* session.
else if (_sessions.size() == 1)
else if (!_isEditLockHeld)
{
Log::debug("Giving editing lock to the first session [" + id + "].");
Log::debug("Giving editing lock to the first editable session [" + id + "].");
_sessions.begin()->second->markEditLock(true);
_isEditLockHeld = true;
}
else
{
@ -392,14 +392,18 @@ size_t DocumentBroker::removeSession(const std::string& id)
if (haveEditLock)
{
// pass the edit lock to first non-readonly session in map
bool editLockGiven = false;
for (auto& session: _sessions)
{
if (!session.second->isReadOnly())
{
session.second->setEditLock(true);
editLockGiven = true;
break;
}
}
_isEditLockHeld = editLockGiven;
}
}

1
loolwsd/DocumentBroker.hpp
View file

@ -257,6 +257,7 @@ private:
mutable std::mutex _mutex;
std::condition_variable _saveCV;
std::mutex _saveMutex;
std::atomic<bool> _isEditLockHeld;
/// Versioning is used to prevent races between
/// painting and invalidation.