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

Initilialize tbb task scheduler correctly. Thanks @oxidase!

Browse Source
This commit is contained in:
Patrick Niklaus 2016-10-10 18:05:17 +02:00 committed by Patrick Niklaus
parent 983ad3513a
commit 769485cc2f
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/extractor/extractor.cpp
View File

@ -108,15 +108,15 @@ transformTurnLaneMapIntoArrays(const guidance::LaneDescriptionMap &turn_lane_map
*/ */
int Extractor::run(ScriptingEnvironment &scripting_environment) int Extractor::run(ScriptingEnvironment &scripting_environment)
{ {
util::LogPolicy::GetInstance().Unmute();
TIMER_START(extracting);
const unsigned recommended_num_threads = tbb::task_scheduler_init::default_num_threads();
const auto number_of_threads =
std::min(recommended_num_threads, config.requested_num_threads);
tbb::task_scheduler_init init(number_of_threads);
{ {
util::LogPolicy::GetInstance().Unmute();
TIMER_START(extracting);
const unsigned recommended_num_threads = tbb::task_scheduler_init::default_num_threads();
const auto number_of_threads =
std::min(recommended_num_threads, config.requested_num_threads);
tbb::task_scheduler_init init(number_of_threads);
util::SimpleLogger().Write() << "Input file: " << config.input_path.filename().string(); util::SimpleLogger().Write() << "Input file: " << config.input_path.filename().string();
if (!config.profile_path.empty()) if (!config.profile_path.empty())
{ {

5
unit_tests/util/static_rtree.cpp
View File

@ -25,6 +25,11 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <tbb/task_scheduler_init.h>
// explicit TBB scheduler init to register resources cleanup at exit
tbb::task_scheduler_init init(2);
BOOST_AUTO_TEST_SUITE(static_rtree) BOOST_AUTO_TEST_SUITE(static_rtree)
using namespace osrm; using namespace osrm;