Scheduling: Switched over to a thread pool model

2 files changed, 8 insertions, 1 deletions

diff --git a/tests/de_level_tomb.cpp b/tests/de_level_tomb.cpp
index 264b5b0..ba3f784 100644
--- a/tests/de_level_tomb.cpp
+++ b/tests/de_level_tomb.cpp
@@ -20,6 +20,6 @@
 #include <check.h>
 using namespace de;
 
-typedef DynamicExtension<WRec, WIRS<WRec>, WIRSQuery<WRec>, LayoutPolicy::LEVELING, DeletePolicy::TOMBSTONE, SerialScheduler> DE;
+typedef DynamicExtension<WRec, WIRS<WRec>, WIRSQuery<WRec>, LayoutPolicy::LEVELING, DeletePolicy::TOMBSTONE, FIFOScheduler> DE;
 
 #include "dynamic_extension_tests.inc"
diff --git a/tests/dynamic_extension_tests.inc b/tests/dynamic_extension_tests.inc
index 2f82e92..df88d98 100644
--- a/tests/dynamic_extension_tests.inc
+++ b/tests/dynamic_extension_tests.inc
@@ -77,6 +77,8 @@ START_TEST(t_insert_with_mem_merges)
         val++;
     }
 
+    ext_wirs->await_next_epoch();
+
     ck_assert_int_eq(ext_wirs->get_record_count(), 300);
     ck_assert_int_eq(ext_wirs->get_height(), 1);
 
@@ -197,6 +199,9 @@ START_TEST(t_range_sample_weighted)
         WRec r = {keys[i], (uint32_t) i, weight};
         ext_wirs->insert(r);
     }
+
+    ext_wirs->await_next_epoch();
+
     size_t k = 1000;
     uint64_t lower_key = 0;
     uint64_t upper_key = 5;
@@ -277,6 +282,8 @@ START_TEST(t_tombstone_merging_01)
         ck_assert(ext_wirs->validate_tombstone_proportion());
     }
 
+    ext_wirs->await_next_epoch();
+
     ck_assert(ext_wirs->validate_tombstone_proportion());
 
     gsl_rng_free(rng);