diff --git a/.travis.yml b/.travis.yml index a2b54f1df..36bff1ba2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,7 @@ matrix: apt: sources: ['ubuntu-toolchain-r-test'] packages: ['libstdc++-5-dev'] - env: CLANG_VERSION='3.9.1' BUILD_TYPE='Release' ENABLE_MASON=ON RUN_CLANG_FORMAT=ON ENABLE_SANITIZER=ON + env: CLANG_VERSION='3.9.1' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_SANITIZER=ON # Release Builds - os: linux diff --git a/src/tools/partition.cpp b/src/tools/partition.cpp index eecc674f8..0038bdd3d 100644 --- a/src/tools/partition.cpp +++ b/src/tools/partition.cpp @@ -3,10 +3,12 @@ #include "util/log.hpp" #include "util/meminfo.hpp" +#include "util/timing_util.hpp" #include "util/version.hpp" #include +#include #include #include @@ -154,8 +156,13 @@ int main(int argc, char *argv[]) try } tbb::task_scheduler_init init(partition_config.requested_num_threads); + BOOST_ASSERT(init.is_active()); + util::Log() << "Computing recursive bisection"; + TIMER_START(bisect); auto exitcode = partition::Partitioner().Run(partition_config); + TIMER_STOP(bisect); + util::Log() << "Bisection took " << TIMER_SEC(bisect) << " seconds."; util::DumpMemoryStats(); diff --git a/unit_tests/partition/recursive_bisection.cpp b/unit_tests/partition/recursive_bisection.cpp index 1782f30bb..6a4aa2286 100644 --- a/unit_tests/partition/recursive_bisection.cpp +++ b/unit_tests/partition/recursive_bisection.cpp @@ -8,6 +8,10 @@ #include #include +// make sure not to leak in recursive bisection +#include +tbb::task_scheduler_init init(2); + using namespace osrm::partition; using namespace osrm::util;