lock to RAM on Linux only after options are parsed
This commit is contained in:
parent
c1806476af
commit
c470ea9fa1
34
routed.cpp
34
routed.cpp
@ -67,21 +67,19 @@ BOOL WINAPI console_ctrl_handler(DWORD ctrl_type)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int main (int argc, const char * argv[]) {
|
int main (int argc, const char * argv[])
|
||||||
try {
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
LogPolicy::GetInstance().Unmute();
|
LogPolicy::GetInstance().Unmute();
|
||||||
#ifdef __linux__
|
|
||||||
if( -1 == mlockall(MCL_CURRENT | MCL_FUTURE) ) {
|
|
||||||
SimpleLogger().Write(logWARNING) <<
|
|
||||||
"Process " << argv[0] << " could not be locked to RAM";
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
bool use_shared_memory = false;
|
bool use_shared_memory = false;
|
||||||
std::string ip_address;
|
std::string ip_address;
|
||||||
int ip_port, requested_thread_num;
|
int ip_port, requested_thread_num;
|
||||||
|
|
||||||
ServerPaths server_paths;
|
ServerPaths server_paths;
|
||||||
if( !GenerateServerProgramOptions(
|
if (!GenerateServerProgramOptions
|
||||||
|
(
|
||||||
argc,
|
argc,
|
||||||
argv,
|
argv,
|
||||||
server_paths,
|
server_paths,
|
||||||
@ -90,17 +88,29 @@ int main (int argc, const char * argv[]) {
|
|||||||
requested_thread_num,
|
requested_thread_num,
|
||||||
use_shared_memory
|
use_shared_memory
|
||||||
)
|
)
|
||||||
) {
|
)
|
||||||
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef __linux__
|
||||||
|
const int lock_flags = (MCL_CURRENT | MCL_FUTURE);
|
||||||
|
if (-1 == mlockall(lock_flags))
|
||||||
|
{
|
||||||
|
SimpleLogger().Write(logWARNING) <<
|
||||||
|
"Process " << argv[0] << " could not be locked to RAM";
|
||||||
|
}
|
||||||
|
#endif
|
||||||
SimpleLogger().Write() <<
|
SimpleLogger().Write() <<
|
||||||
"starting up engines, " << g_GIT_DESCRIPTION << ", " <<
|
"starting up engines, " << g_GIT_DESCRIPTION << ", " <<
|
||||||
"compiled at " << __DATE__ << ", " __TIME__;
|
"compiled at " << __DATE__ << ", " __TIME__;
|
||||||
|
|
||||||
if( use_shared_memory ) {
|
if(use_shared_memory)
|
||||||
|
{
|
||||||
SimpleLogger().Write(logDEBUG) << "Loading from shared memory";
|
SimpleLogger().Write(logDEBUG) << "Loading from shared memory";
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
SimpleLogger().Write() <<
|
SimpleLogger().Write() <<
|
||||||
"HSGR file:\t" << server_paths["hsgrdata"];
|
"HSGR file:\t" << server_paths["hsgrdata"];
|
||||||
SimpleLogger().Write(logDEBUG) <<
|
SimpleLogger().Write(logDEBUG) <<
|
||||||
|
Loading…
Reference in New Issue
Block a user