Use homebrew clang for packaging for macos

The default segfaults now for some reason

CMakeLists.txt

@@ -31,8 +31,14 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
                                                "MinSizeRel" "RelWithDebInfo")
 endif()
 
-add_compile_options(-fdata-sections -ffunction-sections -Wswitch-enum
-                    -Werror=switch-enum -fPIC)
+add_compile_options(
+  -fdata-sections
+  -ffunction-sections
+  -Wswitch-enum
+  -Werror=switch-enum
+  -fPIC
+  -g
+  -fno-omit-frame-pointer)
 
 set(full_relro_flags "-pie;LINKER:-z,relro,-z,now,-z,noexecstack")
 cmake_push_check_state()
@@ -336,6 +342,11 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND BUILD_TESTING)
   add_executable(driver_perf TestDriver.cpp)
   target_compile_definitions(driver_perf PRIVATE PERF_TEST=1)
   target_link_libraries(driver_perf PRIVATE ${PROJECT_NAME})
+
+  # server bench
+  add_executable(server_bench ServerBench.cpp)
+  target_link_libraries(server_bench PRIVATE ${PROJECT_NAME})
+  set_target_properties(server_bench PROPERTIES SKIP_BUILD_RPATH ON)
 endif()
 
 # packaging

README.md

@@ -1,86 +1,38 @@
 A data structure for optimistic concurrency control on ranges of bitwise-lexicographically-ordered keys.
 
-Intended to replace FoundationDB's skip list.
+Intended as an alternative to FoundationDB's skip list.
 
-Hardware for all benchmarks is a mac m1 2020.
+Hardware for all benchmarks is an AMD Ryzen 9 7900 with (2x32GB) 5600MT/s CL28-34-34-89 1.35V RAM
 
-# FoundationDB's benchmark
+# Microbenchmark
 
 ## Skip list
 
-```
-New conflict set: 1.957 sec
-                  0.639 Mtransactions/sec
-                  2.555 Mkeys/sec
-Detect only:      1.845 sec
-                  0.678 Mtransactions/sec
-                  2.710 Mkeys/sec
-Skiplist only:    1.263 sec
-                  0.990 Mtransactions/sec
-                  3.960 Mkeys/sec
-Performance counters:
-               Build: 0.0546
-                 Add: 0.0563
-              Detect: 1.84
-              D.Sort: 0.412
-           D.Combine: 0.0141
-         D.CheckRead: 0.671
-   D.CheckIntraBatch: 0.0068
-        D.MergeWrite: 0.592
-      D.RemoveBefore: 0.146
-```
+|               ns/op |                op/s |    err% |          ins/op |          cyc/op |    IPC |         bra/op |   miss% |     total | benchmark
+|--------------------:|--------------------:|--------:|----------------:|----------------:|-------:|---------------:|--------:|----------:|:----------
+|              172.03 |        5,812,791.77 |    0.4% |        3,130.62 |          879.00 |  3.562 |         509.23 |    0.0% |      0.01 | `point reads`
+|              167.44 |        5,972,130.71 |    0.2% |        3,065.14 |          862.27 |  3.555 |         494.30 |    0.0% |      0.01 | `prefix reads`
+|              238.77 |        4,188,130.84 |    0.9% |        3,589.93 |        1,259.30 |  2.851 |         637.12 |    0.0% |      0.01 | `range reads`
+|              424.01 |        2,358,426.70 |    0.2% |        5,620.05 |        2,242.35 |  2.506 |         854.80 |    1.7% |      0.01 | `point writes`
+|              418.45 |        2,389,780.56 |    0.4% |        5,525.07 |        2,211.05 |  2.499 |         831.71 |    1.7% |      0.01 | `prefix writes`
+|              254.87 |        3,923,568.88 |    2.6% |        3,187.01 |        1,366.50 |  2.332 |         529.11 |    2.7% |      0.02 | `range writes`
+|              675.96 |        1,479,374.50 |    3.3% |        7,735.41 |        3,468.60 |  2.230 |       1,386.02 |    1.8% |      0.01 | `monotonic increasing point writes`
+|          137,986.20 |            7,247.10 |    0.6% |      789,752.33 |      699,462.00 |  1.129 |     144,824.14 |    0.0% |      0.01 | `worst case for radix tree`
+|               21.63 |       46,231,564.03 |    1.0% |          448.00 |          107.14 |  4.181 |          84.00 |    0.0% |      0.01 | `create and destroy`
 
 ## Radix tree (this implementation)
 
-```
-New conflict set: 1.366 sec
-                  0.915 Mtransactions/sec
-                  3.660 Mkeys/sec
-Detect only:      1.248 sec
-                  1.002 Mtransactions/sec
-                  4.007 Mkeys/sec
-Skiplist only:    0.573 sec
-                  2.182 Mtransactions/sec
-                  8.730 Mkeys/sec
-Performance counters:
-               Build: 0.0594
-                 Add: 0.0572
-              Detect: 1.25
-              D.Sort: 0.418
-           D.Combine: 0.0149
-         D.CheckRead: 0.232
-   D.CheckIntraBatch: 0.0067
-        D.MergeWrite: 0.341
-      D.RemoveBefore: 0.232
-```
-
-# Our benchmark
-
-## Skip list
-
-|               ns/op |                op/s |    err% |     total | benchmark
-|--------------------:|--------------------:|--------:|----------:|:----------
-|              245.99 |        4,065,232.81 |    0.3% |      0.01 | `point reads`
-|              265.93 |        3,760,430.49 |    0.2% |      0.01 | `prefix reads`
-|              485.30 |        2,060,569.50 |    0.2% |      0.01 | `range reads`
-|              449.60 |        2,224,195.17 |    0.4% |      0.01 | `point writes`
-|              441.76 |        2,263,688.18 |    1.1% |      0.01 | `prefix writes`
-|              245.42 |        4,074,647.54 |    2.4% |      0.02 | `range writes`
-|              572.80 |        1,745,810.06 |    1.3% |      0.01 | `monotonic increasing point writes`
-|          154,819.33 |            6,459.14 |    0.9% |      0.01 | `worst case for radix tree`
-
-## Radix tree (this implementation)
-
-|               ns/op |                op/s |    err% |     total | benchmark
-|--------------------:|--------------------:|--------:|----------:|:----------
-|               20.25 |       49,372,759.86 |    0.3% |      0.01 | `point reads`
-|               23.58 |       42,401,298.00 |    0.3% |      0.01 | `prefix reads`
-|               64.12 |       15,595,463.14 |    0.8% |      0.01 | `range reads`
-|               29.50 |       33,903,101.20 |    0.7% |      0.01 | `point writes`
-|               46.76 |       21,384,036.19 |    1.2% |      0.01 | `prefix writes`
-|               51.25 |       19,512,195.12 |    0.0% |      0.01 | `range writes`
-|              109.51 |        9,131,469.31 |    3.6% |      0.01 | `monotonic increasing point writes`
-|        1,153,875.00 |              866.65 |    1.6% |      0.01 | `worst case for radix tree`
+|               ns/op |                op/s |    err% |          ins/op |          cyc/op |    IPC |         bra/op |   miss% |     total | benchmark
+|--------------------:|--------------------:|--------:|----------------:|----------------:|-------:|---------------:|--------:|----------:|:----------
+|               12.42 |       80,500,398.66 |    0.8% |          180.38 |           61.57 |  2.930 |          41.51 |    0.4% |      0.01 | `point reads`
+|               15.17 |       65,917,580.99 |    0.2% |          279.47 |           74.95 |  3.729 |          55.54 |    0.3% |      0.01 | `prefix reads`
+|               38.16 |       26,202,393.91 |    0.1% |          803.07 |          189.13 |  4.246 |         141.68 |    0.2% |      0.01 | `range reads`
+|               20.20 |       49,504,615.44 |    0.4% |          363.00 |          100.35 |  3.617 |          49.81 |    0.3% |      0.01 | `point writes`
+|               41.99 |       23,816,559.99 |    0.3% |          799.27 |          209.63 |  3.813 |         154.32 |    0.1% |      0.01 | `prefix writes`
+|               46.28 |       21,607,605.88 |    1.5% |          953.79 |          231.47 |  4.121 |         168.34 |    0.0% |      0.01 | `range writes`
+|               80.99 |       12,347,449.98 |    0.9% |        1,501.97 |          406.50 |  3.695 |         281.89 |    0.1% |      0.01 | `monotonic increasing point writes`
+|          318,010.00 |            3,144.56 |    1.0% |    3,994,511.50 |    1,657,831.50 |  2.409 |     805,969.50 |    0.0% |      0.01 | `worst case for radix tree`
+|               75.85 |       13,183,612.56 |    0.5% |        1,590.01 |          385.64 |  4.123 |         258.00 |    0.0% |      0.01 | `create and destroy`
 
 # "Real data" test
 
@@ -89,13 +41,13 @@ Point queries only, best of three runs. Gc ratio is the ratio of time spent doin
 ## skip list
 
 ```
-Check: 11.3385 seconds, 329.718 MB/s, Add: 5.35612 seconds, 131.072 MB/s, Gc ratio: 45.7173%
+Check: 4.47891 seconds, 364.05 MB/s, Add: 4.55599 seconds, 123.058 MB/s, Gc ratio: 37.1145%
 ```
 
 ## radix tree
 
 ```
-Check: 2.60639 seconds, 1434.36 MB/s, Add: 2.10911 seconds, 332.86 MB/s, Gc ratio: 46.3071%
+Check: 0.963721 seconds, 1691.93 MB/s, Add: 1.3288 seconds, 421.924 MB/s, Gc ratio: 42.8819%
 ```
 
 ## hash table
@@ -103,5 +55,5 @@ Check: 2.60639 seconds, 1434.36 MB/s, Add: 2.10911 seconds, 332.86 MB/s, Gc rati
 (The hash table implementation doesn't work on range queries, and its purpose is to provide an idea of how fast point queries can be)
 
 ```
-Check: 1.83386 seconds, 2038.6 MB/s, Add: 0.601411 seconds, 1167.32 MB/s, Gc ratio: 48.9776%
+Check: 0.804094 seconds, 2027.81 MB/s, Add: 0.652952 seconds, 858.645 MB/s, Gc ratio: 35.3885%
 ```

ServerBench.cpp

@@ -0,0 +1,233 @@
+#include <atomic>
+#include <errno.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
+#include <string_view>
+#include <sys/resource.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#include <thread>
+#include <unistd.h>
+
+#include "ConflictSet.h"
+#include "third_party/nadeau.h"
+
+std::atomic<int64_t> transactions;
+
+constexpr int kBaseSearchDepth = 32;
+constexpr int kWindowSize = 10000000;
+
+std::basic_string<uint8_t> numToKey(int64_t num) {
+  std::basic_string<uint8_t> result;
+  result.resize(kBaseSearchDepth + sizeof(int64_t));
+  memset(result.data(), 0, kBaseSearchDepth);
+  int64_t be = __builtin_bswap64(num);
+  memcpy(result.data() + kBaseSearchDepth, &be, sizeof(int64_t));
+  return result;
+}
+
+void workload(weaselab::ConflictSet *cs) {
+  int64_t version = kWindowSize;
+  cs->addWrites(nullptr, 0, version);
+  for (;; transactions.fetch_add(1, std::memory_order_relaxed)) {
+    // Reads
+    {
+      auto beginK = numToKey(version - kWindowSize);
+      auto endK = numToKey(version - 1);
+      auto pointRv = version - kWindowSize + rand() % kWindowSize + 1;
+      auto pointK = numToKey(pointRv);
+      weaselab::ConflictSet::ReadRange reads[] = {
+          {
+              {pointK.data(), int(pointK.size())},
+              {nullptr, 0},
+              pointRv,
+          },
+          {
+              {beginK.data(), int(beginK.size())},
+              {endK.data(), int(endK.size())},
+              version - 2,
+          },
+      };
+      weaselab::ConflictSet::Result result[sizeof(reads) / sizeof(reads[0])];
+      cs->check(reads, result, sizeof(reads) / sizeof(reads[0]));
+      // for (int i = 0; i < sizeof(reads) / sizeof(reads[0]); ++i) {
+      //   if (result[i] != weaselab::ConflictSet::Commit) {
+      //     fprintf(stderr, "Unexpected conflict: [%s, %s) @ %" PRId64 "\n",
+      //             printable(reads[i].begin).c_str(),
+      //             printable(reads[i].end).c_str(), reads[i].readVersion);
+      //     abort();
+      //   }
+      // }
+    }
+    // Writes
+    {
+      weaselab::ConflictSet::WriteRange w;
+      auto k = numToKey(version);
+      w.begin.p = k.data();
+      w.end.len = 0;
+      if (version % (kWindowSize / 2) == 0) {
+        for (int l = 0; l <= k.size(); ++l) {
+          w.begin.len = l;
+          cs->addWrites(&w, 1, version);
+        }
+      } else {
+        w.begin.len = k.size();
+        cs->addWrites(&w, 1, version);
+      }
+    }
+    // GC
+    cs->setOldestVersion(version - kWindowSize);
+    ++version;
+  }
+}
+
+// Adapted from getaddrinfo man page
+int getListenFd(const char *node, const char *service) {
+
+  struct addrinfo hints;
+  struct addrinfo *result, *rp;
+  int sfd, s;
+
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_UNSPEC;     /* Allow IPv4 or IPv6 */
+  hints.ai_socktype = SOCK_STREAM; /* stream socket */
+  hints.ai_flags = AI_PASSIVE;     /* For wildcard IP address */
+  hints.ai_protocol = 0;           /* Any protocol */
+  hints.ai_canonname = nullptr;
+  hints.ai_addr = nullptr;
+  hints.ai_next = nullptr;
+
+  s = getaddrinfo(node, service, &hints, &result);
+  if (s != 0) {
+    fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(s));
+    abort();
+  }
+
+  /* getaddrinfo() returns a list of address structures.
+     Try each address until we successfully bind(2).
+     If socket(2) (or bind(2)) fails, we (close the socket
+     and) try the next address. */
+
+  for (rp = result; rp != nullptr; rp = rp->ai_next) {
+    sfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+    if (sfd == -1) {
+      continue;
+    }
+
+    int val = 1;
+    setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
+
+    if (bind(sfd, rp->ai_addr, rp->ai_addrlen) == 0) {
+      break; /* Success */
+    }
+
+    close(sfd);
+  }
+
+  freeaddrinfo(result); /* No longer needed */
+
+  if (rp == nullptr) { /* No address succeeded */
+    fprintf(stderr, "Could not bind\n");
+    abort();
+  }
+
+  int rv = listen(sfd, SOMAXCONN);
+  if (rv) {
+    perror("listen()");
+    abort();
+  }
+
+  return sfd;
+}
+
+// HTTP response
+//
+std::string_view part1 =
+    "HTTP/1.1 200 OK \r\nContent-type: text/plain; version=0.0.4; "
+    "charset=utf-8; escaping=values\r\nContent-Length: ";
+// Decimal content length
+std::string_view part2 = "\r\n\r\n";
+// Body
+
+double toSeconds(timeval t) {
+  return double(t.tv_sec) + double(t.tv_usec) * 1e-6;
+}
+
+int main(int argc, char **argv) {
+  if (argc != 3) {
+    goto fail;
+  }
+  {
+    int listenFd = getListenFd(argv[1], argv[2]);
+
+    weaselab::ConflictSet cs{0};
+    weaselab::ConflictSet::MetricsV1 *metrics;
+    int metricsCount;
+    cs.getMetricsV1(&metrics, &metricsCount);
+
+    auto w = std::thread{workload, &cs};
+
+    for (;;) {
+      struct sockaddr_storage peer_addr = {};
+      socklen_t peer_addr_len = sizeof(peer_addr);
+      const int connfd =
+          accept(listenFd, (struct sockaddr *)&peer_addr, &peer_addr_len);
+
+      std::string body;
+
+      rusage r;
+      getrusage(RUSAGE_SELF, &r);
+      body += "# HELP process_cpu_seconds_total Total user and system CPU time "
+              "spent in seconds.\n# TYPE process_cpu_seconds_total counter\n"
+              "process_cpu_seconds_total ";
+      body += std::to_string(toSeconds(r.ru_utime) + toSeconds(r.ru_stime));
+      body += "\n";
+      body += "# HELP process_resident_memory_bytes Resident memory size in "
+              "bytes.\n# TYPE process_resident_memory_bytes gauge\n"
+              "process_resident_memory_bytes ";
+      body += std::to_string(getCurrentRSS());
+      body += "\n";
+      body += "# HELP transactions_total Total number of transactions\n"
+              "# TYPE transactions_total counter\n"
+              "transactions_total ";
+      body += std::to_string(transactions.load(std::memory_order_relaxed));
+      body += "\n";
+
+      for (int i = 0; i < metricsCount; ++i) {
+        body += "# HELP ";
+        body += metrics[i].name;
+        body += " ";
+        body += metrics[i].help;
+        body += "\n";
+        body += "# TYPE ";
+        body += metrics[i].name;
+        body += " ";
+        body += metrics[i].type == metrics[i].Counter ? "counter" : "gauge";
+        body += "\n";
+        body += metrics[i].name;
+        body += " ";
+        body += std::to_string(metrics[i].getValue());
+        body += "\n";
+      }
+
+      auto len = std::to_string(body.size());
+      iovec iov[] = {
+          {(void *)part1.data(), part1.size()},
+          {(void *)len.data(), len.size()},
+          {(void *)part2.data(), part2.size()},
+          {(void *)body.data(), body.size()},
+      };
+      int written;
+      do {
+        written = writev(connfd, iov, sizeof(iov) / sizeof(iov[0]));
+      } while (written < 0 && errno == EINTR);
+      close(connfd);
+    }
+  }
+fail:
+  fprintf(stderr, "Expected ./%s <host> <port>\n", argv[0]);
+  return 1;
+}

corpus/0f5c5f28c31e44ee0ec085fec09adf0981065771

@@ -1,5 +0,0 @@
-
-<EFBFBD><EFBFBD>
-
-
-2

corpus/12bdd00fd4038756cbcf8ecdad1b0cd862603cd8

@@ -1 +0,0 @@
-<EFBFBD>