Initilialize tbb task scheduler correctly. Thanks @oxidase!

Project-OSRM · Oct 19, 2016 · 769485c · 769485c
1 parent 983ad35
commit 769485c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/extractor/extractor.cpp b/src/extractor/extractor.cpp
@@ -108,15 +108,15 @@ transformTurnLaneMapIntoArrays(const guidance::LaneDescriptionMap &turn_lane_map
  */
 int Extractor::run(ScriptingEnvironment &scripting_environment)
 {
-    {
-        util::LogPolicy::GetInstance().Unmute();
-        TIMER_START(extracting);
+    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);
+    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();
         if (!config.profile_path.empty())
         {

diff --git a/unit_tests/util/static_rtree.cpp b/unit_tests/util/static_rtree.cpp
@@ -25,6 +25,11 @@
 #include <utility>
 #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)
 
 using namespace osrm;