[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - Makefile.am wsd/DocumentBroker.cpp wsd/Storage.cpp

[Jan Holesovsky]

 Makefile.am            |    5 +++--
 wsd/DocumentBroker.cpp |    6 ------
 wsd/Storage.cpp        |    5 ++++-
 3 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 0685702e13f3a9025b7efacd5408353dbab9133d
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Apr 5 20:20:47 2017 +0200

    Make the callgrinding possible again.
    
    Change-Id: I9e8e0e3d088c4af29f2701a0318a508f14327fff

diff --git a/Makefile.am b/Makefile.am
index d0e1a40b..2eef478d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -252,8 +252,9 @@ run-callgrind: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
 	@echo "Launching loolwsd under valgrind (but not forkit/loolkit, yet)"
 	@fc-cache "@LO_PATH@"/share/fonts/truetype
 	@cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt
-	valgrind --tool=callgrind --simulate-cache=yes --dump-instr=yes --num-callers=50 --error-limit=no \
-		./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" --o:lo_template_path="@LO_PATH@" \
+	valgrind --tool=callgrind --simulate-cache=yes --dump-instr=yes --num-callers=50 --error-limit=no --trace-children=yes \
+		./loolwsd --nocaps \
+			  --o:sys_template_path="@SYSTEMPLATE_PATH@" --o:lo_template_path="@LO_PATH@" \
 			  --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \
 			  --o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
 			  --o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 5743fcb8..0f896200 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -334,12 +334,6 @@ bool DocumentBroker::load(const std::shared_ptr<ClientSession>& session, const s
     // user/doc/jailId
     const auto jailPath = Poco::Path(JAILED_DOCUMENT_ROOT, jailId);
     std::string jailRoot = getJailRoot();
-#ifndef KIT_IN_PROCESS
-    if (LOOLWSD::NoCapsForKit)
-    {
-        jailRoot = jailPath.toString() + "/" + getJailRoot();
-    }
-#endif
 
     LOG_INF("jailPath: " << jailPath.toString() << ", jailRoot: " << jailRoot);
 
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 94a01c93..a125c1d7 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -248,7 +248,10 @@ std::string LocalStorage::loadStorageFileToLocal()
     _isLoaded = true;
     // Now return the jailed path.
 #ifndef KIT_IN_PROCESS
-    return Poco::Path(_jailPath, filename).toString();
+    if (LOOLWSD::NoCapsForKit)
+        return _jailedFilePath;
+    else
+        return Poco::Path(_jailPath, filename).toString();
 #else
     return _jailedFilePath;
 #endif