Remove some vestigial cmake stuff

Seems more stable

Bench.cpp

@@ -60,7 +60,6 @@ void benchConflictSet() {
   ConflictSet cs{0};
 
   bench.batch(kOpsPerTx);
-  bench.minEpochIterations(10000);
 
   int64_t version = 0;
 
@@ -192,7 +191,6 @@ void benchConflictSet() {
     bench.run("point writes", [&]() {
       auto v = ++version;
       cs.addWrites(writes.data(), writes.size(), v);
-      cs.setOldestVersion(version - kMvccWindow);
     });
   }
 
@@ -213,7 +211,6 @@ void benchConflictSet() {
     bench.run("prefix writes", [&]() {
       auto v = ++version;
       cs.addWrites(writes.data(), writes.size(), v);
-      cs.setOldestVersion(version - kMvccWindow);
     });
   }
 
@@ -234,12 +231,13 @@ void benchConflictSet() {
     bench.run("range writes", [&]() {
       auto v = ++version;
       cs.addWrites(writes.data(), writes.size(), v);
-      cs.setOldestVersion(version - kMvccWindow);
     });
   }
 
   bench.batch(1);
 
+  bench.warmup(10000);
+
   {
     bench.run("monotonic increasing point writes", [&]() {
       auto v = ++version;

CMakeLists.txt

@@ -219,10 +219,6 @@ if(BUILD_TESTING)
   add_executable(conflict_set_bench Bench.cpp)
   target_link_libraries(conflict_set_bench PRIVATE ${PROJECT_NAME})
   set_target_properties(conflict_set_bench PROPERTIES SKIP_BUILD_RPATH ON)
-  # target_compile_options(conflict_set_bench PRIVATE
-  # "-fsanitize=address,undefined,fuzzer")
-  # target_link_options(conflict_set_bench PRIVATE
-  # "-fsanitize=address,undefined,fuzzer")
 
   add_executable(real_data_bench RealDataBench.cpp)
   target_link_libraries(real_data_bench PRIVATE ${PROJECT_NAME})

HashTable.cpp

@@ -56,14 +56,16 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
       return;
     }
     auto iter = map.find(removalKey);
-    if (iter == map.end()) {
-      iter = map.begin();
-    }
-    for (; keyUpdates > 0 && iter != map.end(); --keyUpdates) {
-      if (iter->second <= oldestVersion) {
-        iter = map.erase(iter);
-      } else {
-        ++iter;
+    while (keyUpdates > 0) {
+      if (iter == map.end()) {
+        iter = map.begin();
+      }
+      for (; iter != map.end(); --keyUpdates) {
+        if (iter->second <= oldestVersion) {
+          iter = map.erase(iter);
+        } else {
+          ++iter;
+        }
       }
     }
     if (iter == map.end()) {