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

Adjust number of threads in osrm-routed

Browse Source
This commit is contained in:
Michael Krasnyk 2017-09-15 07:39:08 +02:00
parent ee19383f4d
commit 966139cde9
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools/routed.cpp
View File

@ -87,6 +87,8 @@ inline unsigned generateServerProgramOptions(const int argc,
using boost::program_options::value; using boost::program_options::value;
using boost::filesystem::path; using boost::filesystem::path;
const auto hardware_threads = std::max<int>(1, std::thread::hardware_concurrency());
// declare a group of options that will be allowed only on command line // declare a group of options that will be allowed only on command line
boost::program_options::options_description generic_options("Options"); boost::program_options::options_description generic_options("Options");
generic_options.add_options() // generic_options.add_options() //
@ -106,7 +108,7 @@ inline unsigned generateServerProgramOptions(const int argc,
value<int>(&ip_port)->default_value(5000), value<int>(&ip_port)->default_value(5000),
"TCP/IP port") // "TCP/IP port") //
("threads,t", ("threads,t",
value<int>(&config.use_threads_number)->default_value(8), value<int>(&config.use_threads_number)->default_value(hardware_threads),
"Number of threads to use") // "Number of threads to use") //
("shared-memory,s", ("shared-memory,s",
value<bool>(&config.use_shared_memory)->implicit_value(true)->default_value(false), value<bool>(&config.use_shared_memory)->implicit_value(true)->default_value(false),
@ -195,6 +197,9 @@ inline unsigned generateServerProgramOptions(const int argc,
util::Log(logWARNING) << "Shared memory settings conflict with path settings."; util::Log(logWARNING) << "Shared memory settings conflict with path settings.";
} }
// Adjust number of threads to hardware concurrency
config.use_threads_number = std::min(hardware_threads, config.use_threads_number);
std::cout << visible_options; std::cout << visible_options;
return INIT_OK_DO_NOT_START_ENGINE; return INIT_OK_DO_NOT_START_ENGINE;
} }