Remove coroutine related code.

Author: wangtzh

CMakeLists.txt

@@ -3,10 +3,11 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
   message(FATAL_ERROR "In-source builds are not allowed.")
 endif("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
 
+cmake_minimum_required(VERSION 3.19)
+
 project(ermia)
-cmake_minimum_required(VERSION 2.8)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fcoroutines-ts -stdlib=libc++ -Woverloaded-virtual -Werror=reorder -Wno-address-of-packed-member")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -stdlib=libc++ -Woverloaded-virtual -Werror=reorder -Wno-address-of-packed-member")
 set(LINK_FLAGS "-lc++abi -libverbs -lnuma -lpthread -pthread -lrt -lglog -lgflags")
 link_libraries(${LINK_FLAGS})
 
@@ -68,38 +69,6 @@ add_library(ermia_si SHARED ${LIB_ERMIA_SRC})
 add_executable(ermia_SI ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/dbtest.cc)
 target_link_libraries(ermia_SI ermia_si thread_pool)
 
-# SI with coroutine
-#add_library(ermia_coro_si SHARED ${LIB_ERMIA_SRC})
-#set_target_properties(ermia_coro_si PROPERTIES COMPILE_FLAGS "-DADV_COROUTINE")
-
-#add_executable(ermia_coro_SI ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/dbtest.cc)
-#set_target_properties(ermia_coro_SI PROPERTIES COMPILE_FLAGS "-DADV_COROUTINE")
-#target_link_libraries(ermia_coro_SI ermia_coro_si thread_pool)
-
-# SI+SSN
-#add_library(ermia_si_ssn SHARED ${LIB_ERMIA_SRC})
-#set_target_properties(ermia_si_ssn PROPERTIES COMPILE_FLAGS "-DSSN -DEARLY_SSN_CHECK")
-
-#add_executable(ermia_SI_SSN ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/dbtest.cc)
-#set_target_properties(ermia_SI_SSN PROPERTIES COMPILE_FLAGS "-DSSN -DEARLY_SSN_CHECK")
-#target_link_libraries(ermia_SI_SSN ermia_si_ssn thread_pool)
-
-# SSI
-#add_library(ermia_ssi SHARED ${LIB_ERMIA_SRC})
-#set_target_properties(ermia_ssi PROPERTIES COMPILE_FLAGS "-DSSI")
-
-#add_executable(ermia_SSI ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/dbtest.cc)
-#set_target_properties(ermia_SSI PROPERTIES COMPILE_FLAGS "-DSSI")
-#target_link_libraries(ermia_SSI ermia_ssi thread_pool)
-
-# MVOCC
-#add_library(ermia_mvocc SHARED ${LIB_ERMIA_SRC})
-#set_target_properties(ermia_mvocc PROPERTIES COMPILE_FLAGS "-DMVOCC")
-
-#add_executable(ermia_MVOCC ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/dbtest.cc)
-#set_target_properties(ermia_MVOCC PROPERTIES COMPILE_FLAGS "-DMVOCC")
-#target_link_libraries(ermia_MVOCC ermia_mvocc thread_pool)
-
 # Benchmark scripts
 file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/run.sh" DESTINATION ${CMAKE_BINARY_DIR})
 file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/run2.sh" DESTINATION ${CMAKE_BINARY_DIR})

benchmarks/bench.cc

@@ -128,9 +128,6 @@ bool bench_worker::finish_workload(rc_t ret, uint32_t workload_idx, util::timer
 }
 
 void bench_worker::MyWork(char *) {
-  // Only used for coroutine execution
-  ermia::dia::coro_task_private::memory_pool memory_pool;
-
   if (is_worker) {
     workload = get_workload();
     txn_counts.resize(workload.size());

benchmarks/bench.h

@@ -8,7 +8,6 @@
 #include "../ermia.h"
 #include "../util.h"
 #include "../dbcore/sm-log-alloc.h"
-#include "../dbcore/sm-coroutine.h"
 
 extern void ycsb_do_test(ermia::Engine *db, int argc, char **argv);
 extern void ycsb_cs_advance_do_test(ermia::Engine *db, int argc, char **argv);
@@ -120,22 +119,16 @@ class bench_worker : public ermia::thread::Runner {
 
   /* For 'normal' workload (r/w on primary, r/o on backups) */
   typedef rc_t (*txn_fn_t)(bench_worker *);
-  typedef std::experimental::coroutine_handle<ermia::dia::generator<bool>::promise_type> SimpleCoroHandle;
-  typedef SimpleCoroHandle (*coro_txn_fn_t)(bench_worker *, uint32_t);
-  typedef ermia::dia::task<rc_t> (*task_fn_t)(bench_worker *, uint32_t, ermia::epoch_num);
   struct workload_desc {
     workload_desc() {}
-    workload_desc(const std::string &name, double frequency, txn_fn_t fn,
-                  coro_txn_fn_t cf=nullptr, task_fn_t tf=nullptr)
-        : name(name), frequency(frequency), fn(fn), task_fn(tf), coro_fn(cf) {
+    workload_desc(const std::string &name, double frequency, txn_fn_t fn)
+        : name(name), frequency(frequency), fn(fn) {
       ALWAYS_ASSERT(frequency > 0.0);
       ALWAYS_ASSERT(frequency <= 1.0);
     }
     std::string name;
     double frequency;
     txn_fn_t fn;
-    task_fn_t task_fn;
-    coro_txn_fn_t coro_fn;
   };
   typedef std::vector<workload_desc> workload_desc_vec;
   virtual workload_desc_vec get_workload() const = 0;

dbcore/CMakeLists.txt

@@ -20,7 +20,6 @@ set(DBCORE_SRC
   ${CMAKE_CURRENT_SOURCE_DIR}/sm-cmd-log.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/sm-common.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/sm-config.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/sm-coroutine.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/sm-exceptions.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/sm-table.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/sm-log-alloc.cpp