[Libreoffice-commits] online.git: 2 commits - wsd/DocumentBroker.hpp wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

 wsd/DocumentBroker.hpp |    2 +-
 wsd/LOOLWSD.cpp        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f29be2442d523d876d5dd11e771349477bb4edc7
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Oct 30 19:20:30 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Oct 30 19:34:04 2018 +0200

    In ChildProcess::isAlive(), check _pid also in the MOBILEAPP case
    
    ... instead of returing always true.
    
    The close() member function sets _pid to -1. We should just trust
    that.
    
    This helps a bit in making the app reach the the fully idle state
    faster after closing a document. Tbere were two clear pointless delays
    visible in log output: A long one followed by a shorter one. This gets
    rif of the latter delay. Still need to find the root cause for the
    former one.
    
    Change-Id: I6d890e9eb59d076fde5aa93c55c44acc452b8124

diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index c1bf1758f..c0ab0d57c 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -186,7 +186,7 @@ public:
 
         return false;
 #else
-        return true;
+        return _pid > 1;
 #endif
     }
 
commit 141f0a15fd3c4745140ef2903dc75fc7af23eb37
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Oct 30 19:20:00 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Oct 30 19:20:00 2018 +0200

    Don't use 1 as a fake pid, as real pid 1 is special
    
    Change-Id: I8f2031c462734372a01884a6b30de67964854d1e

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index c0db3952a..8d281a2f5 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1843,7 +1843,7 @@ private:
 
             UnitWSD::get().newChild(*this);
 #else
-            Poco::Process::PID pid = 1;
+            Poco::Process::PID pid = 100;
             std::string jailId = "jail";
             socket->getInBuffer().clear();
 #endif