strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the callgrinding possible again.

Browse source 
Change-Id: I9e8e0e3d088c4af29f2701a0318a508f14327fff
This commit is contained in:
Jan Holesovsky 2017-04-05 20:20:47 +02:00
parent a4176cf2f5
commit fa042ed0e3
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile.am
View file

@ -251,8 +251,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" \

6
wsd/DocumentBroker.cpp
View file

@ -348,12 +348,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);

5
wsd/Storage.cpp
View file

@ -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