[C++] Update to use with VS 2019, benchmark default to non-checkpoint…

…ing (#283) * VS 2019 minor fixes (_SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING). * Benchmark is made non-checkpointing by default, 30 sec run.
microsoft · Jul 2, 2020 · 46de893 · 46de893
1 parent 51fdd31
commit 46de893
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/cc/benchmark-dir/benchmark.cc b/cc/benchmark-dir/benchmark.cc
@@ -47,8 +47,8 @@ static_assert(kCompletePendingInterval % kRefreshInterval == 0,
 static constexpr uint64_t kNanosPerSecond = 1000000000;
 
 static constexpr uint64_t kMaxKey = 268435456;
-static constexpr uint64_t kRunSeconds = 360;
-static constexpr uint64_t kCheckpointSeconds = 30;
+static constexpr uint64_t kRunSeconds = 30;
+static constexpr uint64_t kCheckpointSeconds = 0;
 
 aligned_unique_ptr_t<uint64_t> init_keys_;
 aligned_unique_ptr_t<uint64_t> txn_keys_;
@@ -577,10 +577,10 @@ void run_benchmark(store_t* store, size_t num_threads) {
         last_checkpoint_time = current_time;
       }
     }
-
-    done_ = true;
   }
 
+  done_ = true;
+
   for(auto& thread : threads) {
     thread.join();
   }

diff --git a/cc/playground/sum_store-dir/sum_store.cc b/cc/playground/sum_store-dir/sum_store.cc
@@ -4,7 +4,6 @@
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
-#include <experimental/filesystem>
 #include <string>
 
 #include "concurrent_recovery_test.h"

diff --git a/cc/src/core/faster.h b/cc/src/core/faster.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING
+
 #include <atomic>
 #include <cassert>
 #include <cinttypes>