[Libreoffice-commits] online.git: loolwsd/LOOLBroker.cpp loolwsd/LOOLWSD.cpp

[Ashod Nakashian]

 loolwsd/LOOLBroker.cpp |    4 +++-
 loolwsd/LOOLWSD.cpp    |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 90776a3c0df4e05749ae1dec79b16d2c6a0cd888
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon Feb 15 18:16:02 2016 -0500

    loolwsd: control preinit vs fork using envars and disable bind-now
    
    Change-Id: I63dffa18da69751ab72463bb64065d235d811db5
    Reviewed-on: https://gerrit.libreoffice.org/22381
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 22ae676..9e9089e 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -765,7 +765,9 @@ int main(int argc, char** argv)
     }
 
     // Initialize LoKit and hope we can fork and save memory by sharing pages.
-    const bool sharePages = globalPreinit(loTemplate);
+    const bool sharePages = std::getenv("LOK_PREINIT") != nullptr
+                          ? globalPreinit(loTemplate)
+                          : std::getenv("LOK_FORK") != nullptr;
 
     if (!sharePages)
         Log::warn("Cannot fork, will spawn instead.");
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index f2d41b7..1f1480e 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -885,7 +885,9 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
 {
     Log::initialize("wsd");
 
-    Poco::Environment::set("LD_BIND_NOW", "1");
+    //Poco::Environment::set("LOK_PREINIT", "1");
+    //Poco::Environment::set("LOK_FORK", "1");
+    //Poco::Environment::set("LD_BIND_NOW", "1");
     //Poco::Environment::set("LOK_VIEW_CALLBACK", "1");
 
 #ifdef __linux