Last updates for dissertation

1 files changed, 9 insertions, 6 deletions

diff --git a/benchmarks/tail-latency/query_parm_sweep.cpp b/benchmarks/tail-latency/query_parm_sweep.cpp
index f2453aa..a53cecf 100644
--- a/benchmarks/tail-latency/query_parm_sweep.cpp
+++ b/benchmarks/tail-latency/query_parm_sweep.cpp
@@ -102,12 +102,12 @@ int main(int argc, char **argv) {
   //auto queries = read_range_queries<QP>(q_fname, .0001);
   auto queries =read_sosd_point_lookups<QP>(q_fname, 1);
 
-  size_t buffer_size = 8000;
-  std::vector<size_t> policies = {0, 1};
+  std::vector<size_t> buffer_sizes = {100, 1000, 5000, 8000, 10000, 20000, 100000};
+  std::vector<size_t> policies = {0, 1, 2};
 
   std::vector<size_t> thread_counts = {8};
   std::vector<double> modifiers = {0};
-  std::vector<size_t> scale_factors = {2, 4, 6, 8, 16, 32, 64}; 
+  std::vector<size_t> scale_factors = {2}; 
 
   size_t insert_threads = 1;
   size_t query_threads = 1;
@@ -118,10 +118,12 @@ int main(int argc, char **argv) {
     for (auto internal_thread_cnt : thread_counts) {
       for (auto mod : modifiers) {
         for (auto sf : scale_factors) {
-          auto policy = get_policy<Shard, Q>(sf, buffer_size, pol, n, mod);
+          for (auto bs: buffer_sizes) {
+          auto policy = get_policy<Shard, Q>(sf, bs, pol, n, mod);
           auto config = Conf(std::move(policy));
           config.recon_enable_maint_on_flush = true;
           config.recon_maint_disabled = false;
+          config.buffer_size = bs;
           config.buffer_flush_trigger = config.buffer_size;
           config.maximum_threads = internal_thread_cnt;
 
@@ -173,7 +175,7 @@ int main(int argc, char **argv) {
             total_res.fetch_add(res.size());
           }
 
-          total_query_count.store(100000);
+          total_query_count.store(10000);
           TIMER_INIT();
           TIMER_START();
           for (size_t i=0; i<total_query_count; i++) {
@@ -192,7 +194,7 @@ int main(int argc, char **argv) {
           size_t query_lat = (double)total_query_time.load() /
                              (double)total_query_count.load();
 
-          fprintf(stdout, "%ld\t%ld\t%ld\t%lf\t%ld\t%ld\t%ld\t%ld\n", internal_thread_cnt, pol, sf,
+          fprintf(stdout, "%ld\t%ld\t%ld\t%ld\t%lf\t%ld\t%ld\t%ld\t%ld\n", internal_thread_cnt, bs, pol, sf,
                   mod, extension->get_height(), extension->get_shard_count(),
                   insert_tput, query_lat);
           //extension->print_scheduler_statistics();
@@ -204,6 +206,7 @@ int main(int argc, char **argv) {
           inserts_done.store(false);
           delete extension;
         }
+        }
       }
     }
   }