Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix parameter regression when using shared memory

Browse Source
This commit is contained in:
Dennis Luxen 2014-03-18 10:51:36 +01:00
parent 121dcca7e3
commit 2e4ff30103
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Util/ProgramOptions.h
View File

@ -284,7 +284,10 @@ inline bool GenerateServerProgramOptions(
return true; return true;
} }
if (use_shared_memory && !option_variables.count("base"))
{
return true;
}
SimpleLogger().Write() << visible_options; SimpleLogger().Write() << visible_options;
return false; return false;
} }

31
routed.cpp
View File

@ -78,7 +78,7 @@ int main (int argc, const char * argv[]) {
#endif #endif
bool use_shared_memory = false; bool use_shared_memory = false;
std::string ip_address; std::string ip_address;
int ip_port, requested_num_threads; int ip_port, requested_thread_num;
ServerPaths server_paths; ServerPaths server_paths;
if( !GenerateServerProgramOptions( if( !GenerateServerProgramOptions(
@ -87,7 +87,7 @@ int main (int argc, const char * argv[]) {
server_paths, server_paths,
ip_address, ip_address,
ip_port, ip_port,
requested_num_threads, requested_thread_num,
use_shared_memory use_shared_memory
) )
) { ) {
@ -116,7 +116,7 @@ int main (int argc, const char * argv[]) {
SimpleLogger().Write(logDEBUG) << SimpleLogger().Write(logDEBUG) <<
"Timestamp file:\t" << server_paths["timestamp"]; "Timestamp file:\t" << server_paths["timestamp"];
SimpleLogger().Write(logDEBUG) << SimpleLogger().Write(logDEBUG) <<
"Threads:\t" << requested_num_threads; "Threads:\t" << requested_thread_num;
SimpleLogger().Write(logDEBUG) << SimpleLogger().Write(logDEBUG) <<
"IP address:\t" << ip_address; "IP address:\t" << ip_address;
SimpleLogger().Write(logDEBUG) << SimpleLogger().Write(logDEBUG) <<
@ -130,16 +130,16 @@ int main (int argc, const char * argv[]) {
pthread_sigmask(SIG_BLOCK, &new_mask, &old_mask); pthread_sigmask(SIG_BLOCK, &new_mask, &old_mask);
#endif #endif
OSRM routing_machine(server_paths, use_shared_memory); OSRM osrm_lib(server_paths, use_shared_memory);
Server * s = ServerFactory::CreateServer( Server * routing_server = ServerFactory::CreateServer(
ip_address, ip_address,
ip_port, ip_port,
requested_num_threads requested_thread_num
); );
s->GetRequestHandlerPtr().RegisterRoutingMachine(&routing_machine); routing_server->GetRequestHandlerPtr().RegisterRoutingMachine(&osrm_lib);
boost::thread t(boost::bind(&Server::Run, s)); boost::thread server_thread(boost::bind(&Server::Run, routing_server));
#ifndef _WIN32 #ifndef _WIN32
sigset_t wait_mask; sigset_t wait_mask;
@ -153,24 +153,27 @@ int main (int argc, const char * argv[]) {
sigwait(&wait_mask, &sig); sigwait(&wait_mask, &sig);
#else #else
// Set console control handler to allow server to be stopped. // Set console control handler to allow server to be stopped.
console_ctrl_function = boost::bind(&Server::Stop, s); console_ctrl_function = boost::bind(&Server::Stop, routing_server);
SetConsoleCtrlHandler(console_ctrl_handler, TRUE); SetConsoleCtrlHandler(console_ctrl_handler, TRUE);
std::cout << "[server] running and waiting for requests" << std::endl; std::cout << "[server] running and waiting for requests" << std::endl;
s->Run(); routing_server->Run();
#endif #endif
std::cout << "[server] initiating shutdown" << std::endl; std::cout << "[server] initiating shutdown" << std::endl;
s->Stop(); routing_server->Stop();
std::cout << "[server] stopping threads" << std::endl; std::cout << "[server] stopping threads" << std::endl;
if(!t.timed_join(boost::posix_time::seconds(2))) { if (!server_thread.timed_join(boost::posix_time::seconds(2)))
{
SimpleLogger().Write(logDEBUG) << SimpleLogger().Write(logDEBUG) <<
"Threads did not finish within 2 seconds. Hard abort!"; "Threads did not finish within 2 seconds. Hard abort!";
} }
std::cout << "[server] freeing objects" << std::endl; std::cout << "[server] freeing objects" << std::endl;
delete s; delete routing_server;
std::cout << "[server] shutdown completed" << std::endl; std::cout << "[server] shutdown completed" << std::endl;
} catch (std::exception& e) { }
catch (std::exception& e)
{
std::cerr << "[fatal error] exception: " << e.what() << std::endl; std::cerr << "[fatal error] exception: " << e.what() << std::endl;
} }
#ifdef __linux__ #ifdef __linux__