Update InternalVersionT::zero in addWrite call

There can be other conflict sets in the same thread

Bench.cpp

@@ -358,21 +358,6 @@ void benchWorstCaseForRadixRangeRead() {
   // }
 }
 
-void benchMetrics() {
-  ankerl::nanobench::Bench bench;
-  ConflictSet cs{0};
-
-  int count;
-  ConflictSet::MetricsV1 *m;
-  cs.getMetricsV1(&m, &count);
-  bench.batch(count);
-  bench.run("fetch metric", [&]() {
-    for (int i = 0; i < count; ++i) {
-      m[i].getValue();
-    }
-  });
-}
-
 void benchCreateAndDestroy() {
   ankerl::nanobench::Bench bench;
 
@@ -382,6 +367,5 @@ void benchCreateAndDestroy() {
 int main(void) {
   benchConflictSet();
   benchWorstCaseForRadixRangeRead();
-  benchMetrics();
   benchCreateAndDestroy();
 }

CMakeLists.txt

@@ -353,6 +353,11 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND BUILD_TESTING)
   add_executable(real_data_bench RealDataBench.cpp)
   target_link_libraries(real_data_bench PRIVATE ${PROJECT_NAME})
   set_target_properties(real_data_bench PROPERTIES SKIP_BUILD_RPATH ON)
+
+  # fuzzer-based perf
+  add_executable(driver_perf TestDriver.cpp)
+  target_compile_definitions(driver_perf PRIVATE PERF_TEST=1)
+  target_link_libraries(driver_perf PRIVATE ${PROJECT_NAME})
 endif()
 
 # packaging

HashTable.cpp

@@ -98,6 +98,13 @@ void ConflictSet::setOldestVersion(int64_t oldestVersion) {
 
 int64_t ConflictSet::getBytes() const { return -1; }
 
+void ConflictSet::getMetricsV1(MetricsV1 **metrics, int *count) const {
+  *metrics = nullptr;
+  *count = 0;
+}
+
+double ConflictSet::MetricsV1::getValue() const { return 0; }
+
 ConflictSet::ConflictSet(int64_t oldestVersion)
     : impl(new(safe_malloc(sizeof(Impl))) Impl{oldestVersion}) {}
 

Internal.h

@@ -578,7 +578,8 @@ inline const char *resultToStr(ConflictSet::Result r) {
 
 namespace {
 
-template <class ConflictSetImpl> struct TestDriver {
+template <class ConflictSetImpl, bool kEnableAssertions = true>
+struct TestDriver {
   Arbitrary arbitrary;
   explicit TestDriver(const uint8_t *data, size_t size)
       : arbitrary({data, size}) {}
@@ -724,10 +725,14 @@ template <class ConflictSetImpl> struct TestDriver {
       cs.addWrites(writes, numPointWrites + numRangeWrites, v);
       CALLGRIND_STOP_INSTRUMENTATION;
 
-      refImpl.addWrites(writes, numPointWrites + numRangeWrites, v);
+      if constexpr (kEnableAssertions) {
+        refImpl.addWrites(writes, numPointWrites + numRangeWrites, v);
+      }
 
       cs.setOldestVersion(oldestVersion);
-      refImpl.setOldestVersion(oldestVersion);
+      if constexpr (kEnableAssertions) {
+        refImpl.setOldestVersion(oldestVersion);
+      }
 
 #ifdef THREAD_TEST
       thread2.join();
@@ -821,16 +826,18 @@ template <class ConflictSetImpl> struct TestDriver {
       cs.check(reads, results1, numPointReads + numRangeReads);
       CALLGRIND_STOP_INSTRUMENTATION;
 
-      // Call remaining const methods
-      cs.getBytes();
-      ConflictSet::MetricsV1 *m;
-      int count;
-      cs.getMetricsV1(&m, &count);
-      for (int i = 0; i < count; ++i) {
-        m[i].getValue();
-      }
+      if constexpr (kEnableAssertions) {
+        // Call remaining const methods
+        cs.getBytes();
+        ConflictSet::MetricsV1 *m;
+        int count;
+        cs.getMetricsV1(&m, &count);
+        for (int i = 0; i < count; ++i) {
+          m[i].getValue();
+        }
 
-      refImpl.check(reads, results2, numPointReads + numRangeReads);
+        refImpl.check(reads, results2, numPointReads + numRangeReads);
+      }
 
       auto compareResults = [reads](ConflictSet::Result *results1,
                                     ConflictSet::Result *results2, int count) {
@@ -857,9 +864,12 @@ template <class ConflictSetImpl> struct TestDriver {
         return true;
       };
 
-      if (!compareResults(results1, results2, numPointReads + numRangeReads)) {
-        ok = false;
-        return true;
+      if constexpr (kEnableAssertions) {
+        if (!compareResults(results1, results2,
+                            numPointReads + numRangeReads)) {
+          ok = false;
+          return true;
+        }
       }
 
 #ifdef THREAD_TEST

Jenkinsfile

@@ -48,7 +48,7 @@ pipeline {
                 recordIssues(tools: [clang()])
             }
         }
-        stage('Clang - debug') {
+        stage('Debug') {
             agent {
                 dockerfile {
                     args '-v /home/jenkins/ccache:/ccache'
@@ -57,7 +57,6 @@ pipeline {
             }
             steps {
                 CleanBuildAndTest("-DCMAKE_BUILD_TYPE=Debug")
-                recordIssues(tools: [clang()])
             }
         }
         stage('SIMD fallback') {

TestDriver.cpp

@@ -3,17 +3,35 @@
 #include <fstream>
 #include <sstream>
 
+#ifndef PERF_TEST
+#define PERF_TEST 0
+#endif
+
 int main(int argc, char **argv) {
   for (int i = 1; i < argc; ++i) {
     std::ifstream t(argv[i], std::ios::binary);
     std::stringstream buffer;
     buffer << t.rdbuf();
     auto str = buffer.str();
-    TestDriver<ConflictSet> driver{(const uint8_t *)str.data(), str.size()};
+    TestDriver<ConflictSet, !PERF_TEST> driver{(const uint8_t *)str.data(),
+                                               str.size()};
     while (!driver.next())
       ;
     if (!driver.ok) {
       abort();
     }
+
+    ConflictSet::MetricsV1 *metrics;
+    int metricsCount;
+    driver.cs.getMetricsV1(&metrics, &metricsCount);
+    printf("#################### METRICS FOR %s ####################\n",
+           argv[i]);
+    for (int i = 0; i < metricsCount; ++i) {
+      printf("# HELP %s %s\n", metrics[i].name, metrics[i].help);
+      printf("# TYPE %s %s\n", metrics[i].name,
+             metrics[i].type == metrics[i].Counter ? "counter" : "gauge");
+      printf("%s %g\n", metrics[i].name, metrics[i].getValue());
+    }
+    puts("");
   }
 }

aarch64-symbol-imports.txt

@@ -1,11 +1,10 @@
 __aarch64_cas8_relax
+__getauxval@GLIBC_2.17
 __stack_chk_fail@GLIBC_2.17
 __stack_chk_guard@GLIBC_2.17
 abort@GLIBC_2.17
 free@GLIBC_2.17
 malloc@GLIBC_2.17
-memcmp@GLIBC_2.17
 memcpy@GLIBC_2.17
 memmove@GLIBC_2.17
-memset@GLIBC_2.17
-strlen@GLIBC_2.17
+memset@GLIBC_2.17

apple-symbol-imports.txt

@@ -5,8 +5,6 @@ _abort
 _bzero
 _free
 _malloc
-_memcmp
 _memcpy
 _memmove
-_strlen
 dyld_stub_binder

include/ConflictSet.h

@@ -91,7 +91,7 @@ struct __attribute__((__visibility__("default"))) ConflictSet {
   /** Experimental! */
   struct MetricsV1 {
     /** A null-terminated string with static lifetime. Identifies this metric.
-     * Matches the regex [a-zA-Z_:][a-zA-Z0-9_:]*
+     * Matches the regex [a-zA-Z][a-zA-Z0-9_]*
      */
     const char *name;
     /** A null-terminated string with static lifetime. Describes this metric.

symbol-imports.txt

@@ -6,8 +6,6 @@ __tls_get_addr@GLIBC_2.3
 abort@GLIBC_2.2.5
 free@GLIBC_2.2.5
 malloc@GLIBC_2.2.5
-memcmp@GLIBC_2.2.5
 memcpy@GLIBC_2.14
 memmove@GLIBC_2.2.5
-memset@GLIBC_2.2.5
-strlen@GLIBC_2.2.5
+memset@GLIBC_2.2.5

test_conflict_set.py

@@ -56,6 +56,20 @@ def test_conflict_set():
         assert cs.check(read(0, key), read(1, key)) == [Result.TOO_OLD, Result.COMMIT]
 
 
+def test_update_zero():
+    with DebugConflictSet() as cs1:
+        with DebugConflictSet() as cs2:
+            cs1.addWrites(2, write(b""))
+            cs1.setOldestVersion(2)
+            # "zero" is now 2
+
+            # make a Node48
+            for i in range(256 - 17, 256):
+                cs2.addWrites(int(1), write(bytes([i])))
+            # Scan until first point write
+            cs2.check(read(0, b"\x00", bytes([256 - 17])))
+
+
 def test_inner_full_words():
     with DebugConflictSet() as cs:
         cs.addWrites(1, write(b"\x3f\x61"), write(b"\x81\x61"))