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

[Michael Meeks]

 loolwsd/LOOLWSD.cpp |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f56d96229df69fe730b3f22f516a764c07a994ca
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Aug 31 22:05:02 2016 +0100

    Avoid profiling CL devices during jail setup.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 1e090ab..4d1628b 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1452,6 +1452,9 @@ void LOOLWSD::initialize(Application& self)
         setenv("MAX_CONCURRENCY", std::to_string(maxConcurrency).c_str(), 1);
     }
 
+    // Otherwise we profile the soft-device at jail creation time.
+    setenv ("SAL_DISABLE_OPENCL", "true", 1);
+
     // In Trial Versions we might want to set some limits.
     LOOLWSD::NumDocBrokers = 0;
     LOOLWSD::NumConnections = 0;