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

Display number threads that are really used

Browse Source
This commit is contained in:
Patrick Niklaus 2014-05-01 18:32:01 +02:00 committed by Dennis Luxen
parent 56f6c795ed
commit 52e5483dfb
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extractor.cpp
View File

@ -150,14 +150,16 @@ int main (int argc, char *argv[]) {
return 1; return 1;
} }
int real_num_threads = std::min(omp_get_num_procs(), requested_num_threads);
SimpleLogger().Write() << "Input file: " << input_path.filename().string(); SimpleLogger().Write() << "Input file: " << input_path.filename().string();
SimpleLogger().Write() << "Profile: " << profile_path.filename().string(); SimpleLogger().Write() << "Profile: " << profile_path.filename().string();
SimpleLogger().Write() << "Threads: " << requested_num_threads; SimpleLogger().Write() << "Threads: " << real_num_threads << " (requested " << requested_num_threads << ")";
/*** Setup Scripting Environment ***/ /*** Setup Scripting Environment ***/
ScriptingEnvironment scriptingEnvironment(profile_path.c_str()); ScriptingEnvironment scriptingEnvironment(profile_path.c_str());
omp_set_num_threads(std::min(omp_get_num_procs(), requested_num_threads)); omp_set_num_threads(real_num_threads);
bool file_has_pbf_format(false); bool file_has_pbf_format(false);
std::string output_file_name = input_path.string(); std::string output_file_name = input_path.string();

6
prepare.cpp
View File

@ -149,12 +149,14 @@ int main (int argc, char *argv[]) {
return 1; return 1;
} }
int real_num_threads = std::min(omp_get_num_procs(), requested_num_threads);
SimpleLogger().Write() << "Input file: " << input_path.filename().string(); SimpleLogger().Write() << "Input file: " << input_path.filename().string();
SimpleLogger().Write() << "Restrictions file: " << restrictions_path.filename().string(); SimpleLogger().Write() << "Restrictions file: " << restrictions_path.filename().string();
SimpleLogger().Write() << "Profile: " << profile_path.filename().string(); SimpleLogger().Write() << "Profile: " << profile_path.filename().string();
SimpleLogger().Write() << "Threads: " << requested_num_threads; SimpleLogger().Write() << "Threads: " << real_num_threads << " (requested " << requested_num_threads << ")";
omp_set_num_threads( std::min( omp_get_num_procs(), requested_num_threads) ); omp_set_num_threads(real_num_threads);
LogPolicy::GetInstance().Unmute(); LogPolicy::GetInstance().Unmute();
boost::filesystem::ifstream restrictionsInstream(restrictions_path, std::ios::binary); boost::filesystem::ifstream restrictionsInstream(restrictions_path, std::ios::binary);
TurnRestriction restriction; TurnRestriction restriction;