Merge commit '6eb4f090f98f6b17a23c57768c16b7716b6c9cbd' as 'third_party/libosmium'

third_party/libosmium/test/t/thread/test_pool.cpp

@@ -0,0 +1,118 @@
+#include "catch.hpp"
+
+#include <chrono>
+#include <stdexcept>
+#include <thread>
+
+#include <osmium/thread/pool.hpp>
+#include <osmium/util/compatibility.hpp>
+
+struct test_job_with_result {
+    int operator()() const {
+        return 42;
+    }
+};
+
+struct test_job_throw {
+    OSMIUM_NORETURN void operator()() const {
+        throw std::runtime_error{"exception in pool thread"};
+    }
+};
+
+TEST_CASE("number of threads in pool") {
+
+    // hardcoded setting
+    REQUIRE(osmium::thread::detail::get_pool_size( 1,  0,  2) ==  1);
+    REQUIRE(osmium::thread::detail::get_pool_size( 4,  0,  2) ==  4);
+    REQUIRE(osmium::thread::detail::get_pool_size( 4,  0,  4) ==  4);
+    REQUIRE(osmium::thread::detail::get_pool_size(16,  0,  4) == 16);
+    REQUIRE(osmium::thread::detail::get_pool_size(16,  0, 16) == 16);
+    REQUIRE(osmium::thread::detail::get_pool_size( 8,  4,  2) ==  8);
+    REQUIRE(osmium::thread::detail::get_pool_size( 8, 16,  2) ==  8);
+    REQUIRE(osmium::thread::detail::get_pool_size(-2, 16,  2) ==  1);
+    REQUIRE(osmium::thread::detail::get_pool_size(-2, 16,  8) ==  6);
+
+    // user decides through OSMIUM_POOL_THREADS env variable
+    REQUIRE(osmium::thread::detail::get_pool_size( 0,  0,  2) ==  1);
+    REQUIRE(osmium::thread::detail::get_pool_size( 0, -2,  4) ==  2);
+    REQUIRE(osmium::thread::detail::get_pool_size( 0, -1,  8) ==  7);
+    REQUIRE(osmium::thread::detail::get_pool_size( 0,  0, 16) == 14);
+    REQUIRE(osmium::thread::detail::get_pool_size( 0,  1, 16) ==  1);
+    REQUIRE(osmium::thread::detail::get_pool_size( 0,  2, 16) ==  2);
+    REQUIRE(osmium::thread::detail::get_pool_size( 0,  4, 16) ==  4);
+    REQUIRE(osmium::thread::detail::get_pool_size( 0,  8, 16) ==  8);
+
+    // outliers
+    REQUIRE(osmium::thread::detail::get_pool_size(-100, 0, 16) ==  1);
+    REQUIRE(osmium::thread::detail::get_pool_size(1000, 0, 16) == 32);
+
+}
+
+TEST_CASE("if zero number of threads requested, threads configured") {
+    osmium::thread::Pool pool{0};
+    REQUIRE(pool.num_threads() > 0);
+}
+
+TEST_CASE("if any negative number of threads requested, threads configured") {
+    osmium::thread::Pool pool{-1};
+    REQUIRE(pool.num_threads() > 0);
+}
+
+TEST_CASE("if outlier negative number of threads requested, threads configured") {
+    osmium::thread::Pool pool{-100};
+    REQUIRE(pool.num_threads() > 0);
+}
+
+TEST_CASE("if outlier positive number of threads requested, threads configured") {
+    osmium::thread::Pool pool{1000};
+    REQUIRE(pool.num_threads() > 0);
+}
+
+TEST_CASE("thread") {
+
+    auto& pool = osmium::thread::Pool::default_instance();
+
+    SECTION("can get access to thread pool") {
+        REQUIRE(pool.queue_empty());
+    }
+
+    SECTION("can send job to thread pool") {
+        auto future = pool.submit(test_job_with_result{});
+
+        REQUIRE(future.get() == 42);
+    }
+
+    SECTION("can throw from job in thread pool") {
+        auto future = pool.submit(test_job_throw{});
+
+        REQUIRE_THROWS_AS(future.get(), const std::runtime_error&);
+    }
+
+}
+
+TEST_CASE("thread (user-provided pool)") {
+
+    osmium::thread::Pool pool{7};
+
+    SECTION("can get access to thread pool") {
+        REQUIRE(pool.queue_empty());
+    }
+    
+    SECTION("can access user-provided number of threads") {
+        REQUIRE(pool.num_threads() == 7);
+    }
+
+    SECTION("can send job to thread pool") {
+        auto future = pool.submit(test_job_with_result{});
+
+        REQUIRE(future.get() == 42);
+    }
+
+    SECTION("can throw from job in thread pool") {
+        auto future = pool.submit(test_job_throw{});
+
+        REQUIRE_THROWS_AS(future.get(), const std::runtime_error&);
+    }
+
+}
+

third_party/libosmium/test/t/thread/test_util.cpp

@@ -0,0 +1,37 @@
+#include <catch.hpp>
+
+#include <stdexcept>
+
+#include <osmium/thread/util.hpp>
+
+TEST_CASE("check_for_exception") {
+    std::promise<int> p;
+    auto f = p.get_future();
+
+    SECTION("not ready") {
+        osmium::thread::check_for_exception(f);
+    }
+    SECTION("ready") {
+        p.set_value(3);
+        osmium::thread::check_for_exception(f);
+    }
+    SECTION("no shared state") {
+        p.set_value(3);
+        REQUIRE(f.get() == 3);
+        osmium::thread::check_for_exception(f);
+    }
+}
+
+TEST_CASE("check_for_exception with exception") {
+    std::promise<int> p;
+    auto f = p.get_future();
+
+    try {
+        throw std::runtime_error{"TEST"};
+    } catch(...) {
+        p.set_exception(std::current_exception());
+    }
+
+    REQUIRE_THROWS_AS(osmium::thread::check_for_exception(f), const std::runtime_error&);
+}
+