test/httpwstest.cpp | 3 ++-
wsd/protocol.txt | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit b97e02bcfc4ad7512796032610a73695fd185437
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Thu Jul 6 19:21:24 2017 +0530
Fix HTTPWSTest::testInactiveClient
Fallback from 3a43f691167c6ad08ffc5670384ca3ab8cadcbe2
Change-Id: I8840e78bd4deec1edb2e3c4166134ac6ac4b3abf
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index c207b5ea..14a2fb24 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -1342,7 +1342,8 @@ void HTTPWSTest::testInactiveClient()
token == "textselectionstart:" ||
token == "textviewselection:" ||
token == "viewcursorvisible:" ||
- token == "viewinfo:");
+ token == "viewinfo:" ||
+ token == "editor:");
// End when we get state changed.
return (token != "statechanged:");
commit 3eaf31f81be654e82cfa27d5d4576e664f4d6757
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Thu Jul 6 13:50:29 2017 +0530
Document missing protocol message
Change-Id: I79b2ceb1dafb884356b2b0a0b6fb59b493784fe4
diff --git a/wsd/protocol.txt b/wsd/protocol.txt
index 281aa257..df96f5dc 100644
--- a/wsd/protocol.txt
+++ b/wsd/protocol.txt
@@ -459,6 +459,11 @@ client-<sessionId> <Payload Message>
Forwarding message between a child and its parent session.
The payload message is forwarded to the ClientSession.
+procmemstats: pid=<pid> pss=<pss in kb> dirty=<private dirty in kb>
+
+ Memory information sent periodically to parent process by each of
+ the kit processes.
+
parent -> child
===============
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
