Merge pull request sharathvemula#3 from sharathvemula/newWaffle

Added deleteKeys thread
dsg-uwaterloo · Feb 9, 2023 · 41df455 · 41df455
2 parents 4593967 + 365bd02
commit 41df455
Show file tree

Hide file tree

Showing 19 changed files with 539,532 additions and 8 deletions.
diff --git a/waffleClient/benchmark/src/proxy_benchmark.cpp b/waffleClient/benchmark/src/proxy_benchmark.cpp
@@ -165,7 +165,7 @@ void client(int idx, int client_batch_size, int object_size, trace_vector &trace
     line.append("Xput: " + std::to_string(indiv_xput) + "\n");
     out << line;
     xput += indiv_xput;
-    // std::cout << "indiv_xput is: " << indiv_xput << std::endl;
+
     std::cout << "xput is: " << xput << std::endl;
     std::cout << "Beginning cooldown" << std::endl;
     cooldown(latencies, client_batch_size, object_size, trace, indiv_xput, client);

diff --git a/waffleClient/bin/proxy_benchmark b/waffleClient/bin/proxy_benchmark
diff --git a/waffleClient/bin/proxy_server b/waffleClient/bin/proxy_server
diff --git a/...eClient/cmakebuild/benchmark/CMakeFiles/proxy_benchmark.dir/__/libstorage/src/redis.cpp.o b/...eClient/cmakebuild/benchmark/CMakeFiles/proxy_benchmark.dir/__/libstorage/src/redis.cpp.o
diff --git a/...lient/cmakebuild/benchmark/CMakeFiles/proxy_benchmark.dir/__/proxy/src/waffle_proxy.cpp.o b/...lient/cmakebuild/benchmark/CMakeFiles/proxy_benchmark.dir/__/proxy/src/waffle_proxy.cpp.o
diff --git a/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/__/libstorage/src/redis.cpp.o b/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/__/libstorage/src/redis.cpp.o
diff --git a/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/__/proxy/src/waffle_proxy.cpp.o b/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/__/proxy/src/waffle_proxy.cpp.o
diff --git a/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/src/proxy_server.cpp.o b/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/src/proxy_server.cpp.o