[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - wsd/LOOLWSD.cpp

Ashod Nakashian ashod.nakashian at collabora.co.uk
Mon Mar 27 01:26:19 UTC 2017


 wsd/LOOLWSD.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 082678adb24003dc1128923a470cec1f9203c713
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon Jan 2 15:40:20 2017 -0500

    wsd: correctly count outstanding spawned children
    
    Change-Id: I6e2d5c7d8fdfbcd268ef97cb1272bce76e8b69de
    Reviewed-on: https://gerrit.libreoffice.org/35577
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 39538828..9ea9d497 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -296,7 +296,7 @@ static void forkChildren(const int number)
         const std::string aMessage = "spawn " + std::to_string(number) + "\n";
         LOG_DBG("MasterToForKit: " << aMessage.substr(0, aMessage.length() - 1));
 
-        ++OutstandingForks;
+        OutstandingForks += number;
         IoUtil::writeToPipe(LOOLWSD::ForKitWritePipe, aMessage);
         LastForkRequestTime = std::chrono::steady_clock::now();
     }


More information about the Libreoffice-commits mailing list