Skip sorting if already sorted for skip list

CMakeLists.txt

@@ -380,12 +380,14 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND BUILD_TESTING)
         ${symbol_imports})
   endif()
 
+  if(NOT CMAKE_CROSSCOMPILING)
     find_program(HARDENING_CHECK hardening-check)
     if(HARDENING_CHECK)
       add_test(NAME hardening_check
                COMMAND ${HARDENING_CHECK} $<TARGET_FILE:${PROJECT_NAME}>
                        --nofortify --nostackprotector)
     endif()
+  endif()
 
   # bench
   add_executable(conflict_set_bench Bench.cpp)

ConflictSet.cpp

@@ -3183,6 +3183,12 @@ Node *firstGeqPhysical(Node *n, const TrivialSpan key) {
 #define PRESERVE_NONE
 #endif
 
+#if __has_attribute(musttail) && __has_attribute(preserve_none)
+constexpr bool kEnableInterleaved = true;
+#else
+constexpr bool kEnableInterleaved = false;
+#endif
+
 namespace check {
 
 typedef PRESERVE_NONE void (*Continuation)(struct Job *, struct Context *);
@@ -4969,7 +4975,7 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
     check::Context context;
     context.readContext.impl = this;
 
-#if __has_attribute(musttail)
+    if constexpr (kEnableInterleaved) {
       if (count == 1) {
         useSequential(reads, result, count, context);
       } else {
@@ -4995,8 +5001,8 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
         inProgress[0].prev = inProgress + started - 1;
         inProgress[started - 1].next = inProgress;
 
-      // Kick off the sequence of tail calls that finally returns once all jobs
+        // Kick off the sequence of tail calls that finally returns once all
-      // are done
+        // jobs are done
         inProgress->continuation(inProgress, &context);
 
 #ifndef NDEBUG
@@ -5009,10 +5015,9 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
         assert(context.readContext == context2.readContext);
 #endif
       }
-
+    } else {
-#else
       useSequential(reads, result, count, context);
-#endif
+    }
 
     for (int i = 0; i < count; ++i) {
       assert(reads[i].readVersion >= 0);
@@ -5186,11 +5191,6 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
     assert(allPointWrites || sorted);
 #endif
 
-#if __has_attribute(musttail)
-    constexpr bool kEnableInterleaved = true;
-#else
-    constexpr bool kEnableInterleaved = false;
-#endif
     if (kEnableInterleaved && count > 1) {
       interleavedWrites(writes, count, InternalVersionT(writeVersion));
     } else {

ServerBench.cpp

@@ -64,31 +64,47 @@ template <class... Ts> std::string tupleKey(const Ts &...ts) {
   return result;
 }
 
-constexpr int kWindowSize = 300000;
+constexpr int kTotalKeyRange = 1'000'000'000;
+constexpr int kWindowSize = 1'000'000;
+constexpr int kNumKeys = 10;
 
 void workload(weaselab::ConflictSet *cs) {
   int64_t version = kWindowSize;
-  constexpr int kNumWrites = 16;
   for (;; transactions.fetch_add(1, std::memory_order_relaxed)) {
     std::vector<int64_t> keyIndices;
-    for (int i = 0; i < kNumWrites; ++i) {
+    for (int i = 0; i < kNumKeys; ++i) {
-      keyIndices.push_back(rand() % 100'000'000);
+      keyIndices.push_back(rand() % kTotalKeyRange);
     }
     std::sort(keyIndices.begin(), keyIndices.end());
     std::vector<std::string> keys;
-    std::vector<weaselab::ConflictSet::WriteRange> writes;
+    constexpr std::string_view fullString =
-    constexpr std::string_view suffix = "this is a suffix";
+        "this is a string, where a prefix of it is used as an element of the "
-    for (int i = 0; i < kNumWrites; ++i) {
+        "tuple forming the key";
-      keys.push_back(tupleKey(0x100, i, keyIndices[i],
+    for (int i = 0; i < kNumKeys; ++i) {
-                              suffix.substr(0, rand() % suffix.size()),
+      keys.push_back(
-                              rand()));
+          tupleKey(0x100, keyIndices[i] / fullString.size(),
+                   fullString.substr(0, keyIndices[i] % fullString.size())));
       // printf("%s\n", printable(keys.back()).c_str());
     }
-    for (int i = 0; i < kNumWrites; ++i) {
+
+    std::vector<weaselab::ConflictSet::ReadRange> reads;
+    std::vector<weaselab::ConflictSet::WriteRange> writes;
+    std::vector<weaselab::ConflictSet::Result> results;
+    for (int i = 0; i < kNumKeys; ++i) {
       writes.push_back({{(const uint8_t *)keys[i].data(), int(keys[i].size())},
                         {nullptr, 0}});
+      reads.push_back({{(const uint8_t *)keys[i].data(), int(keys[i].size())},
+                       {nullptr, 0},
+                       version - kWindowSize});
     }
-    cs->addWrites(writes.data(), writes.size(), version);
+    results.resize(reads.size());
+
+    cs->check(reads.data(), results.data(), reads.size());
+    bool ok = true;
+    for (auto result : results) {
+      ok &= result == weaselab::ConflictSet::Commit;
+    }
+    cs->addWrites(writes.data(), ok ? writes.size() : 0, version);
     cs->setOldestVersion(version - kWindowSize);
     ++version;
   }

SkipList.cpp

@@ -767,7 +767,9 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
           false, true);
     }
 
+    if (!std::is_sorted(points.begin(), points.end())) {
       sortPoints(points);
+    }
 
     int activeWriteCount = 0;
     std::vector<std::pair<StringRef, StringRef>> combinedWriteConflictRanges;