Make preinit the default. Turn off with LOK_NO_PREINIT

This commit is contained in:
Tor Lillqvist 2016-03-02 08:26:15 +02:00
parent 78579b3e57
commit 73282c50d6
2 changed files with 1 additions and 2 deletions

View file

@ -775,7 +775,7 @@ int main(int argc, char** argv)
}
// Initialize LoKit and hope we can fork and save memory by sharing pages.
const bool sharePages = std::getenv("LOK_PREINIT") != nullptr
const bool sharePages = std::getenv("LOK_NO_PREINIT") == nullptr
? globalPreinit(loTemplate)
: std::getenv("LOK_FORK") != nullptr;

View file

@ -911,7 +911,6 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
return Application::EXIT_USAGE;
}
//Environment::set("LOK_PREINIT", "1");
//Environment::set("LOK_FORK", "1");
//Environment::set("LD_BIND_NOW", "1");
//Environment::set("LOK_VIEW_CALLBACK", "1");