net/Socket.hpp | 2 ++ wsd/DocumentBroker.cpp | 2 ++ 2 files changed, 4 insertions(+)
New commits: commit 5cafa006dc138e84fbd877654e561d958a300ff7 Author: Michael Meeks <[email protected]> Date: Fri Mar 10 23:28:54 2017 +0000 Wakeup poll after queueing a new session. diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index e9df227..2f53f7b 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -717,6 +717,7 @@ size_t DocumentBroker::queueSession(std::shared_ptr<ClientSession>& session) Util::assertIsLocked(_mutex); _newSessions.push_back(NewSession(session)); + _poll->wakeup(); return _sessions.size() + _newSessions.size(); } commit 5763d8d9bb77cc516417ad0874ec6c22a29140e6 Author: Michael Meeks <[email protected]> Date: Fri Mar 10 23:28:34 2017 +0000 Improve debugging. diff --git a/net/Socket.hpp b/net/Socket.hpp index 0cd5c7c..88ef163 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -308,6 +308,8 @@ public: rc = ::poll(&_pollFds[0], size + 1, (timeout - now)/1000); } while (rc < 0 && errno == EINTR); + LOG_TRC("Poll completed with " << rc << " live polls " + << ((rc==0) ? "timeout" : "")); // Fire the callback and remove dead fds. Poco::Timestamp newNow; diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 1369ba5..e9df227 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -1318,6 +1318,7 @@ void DocumentBroker::dumpState() std::cerr << " jailed uri: " << _uriJailed.toString() << "\n"; std::cerr << " doc key: " << _docKey << "\n"; std::cerr << " num sessions: " << getSessionsCount() << "\n"; + std::cerr << " new sessions: " << _newSessions.size() << "\n"; std::cerr << " last editable?: " << _lastEditableSession << "\n"; std::cerr << " cursor " << _cursorPosX << ", " << _cursorPosY << "( " << _cursorWidth << "," << _cursorHeight << ")\n"; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
