Waffle updated version commit-2 (not fully working)

dsg-uwaterloo · Feb 7, 2023 · daf99ea · daf99ea
1 parent 07b87cf
commit daf99ea
Show file tree

Hide file tree

Showing 58 changed files with 182,703 additions and 93 deletions.
diff --git a/waffleClient/benchmark/CMakeLists.txt b/waffleClient/benchmark/CMakeLists.txt
@@ -46,6 +46,8 @@ add_executable(proxy_benchmark
         ../proxy/src/Cache.hpp
         ../proxy/src/FrequencySmoother.cpp
         ../proxy/src/FrequencySmoother.hpp
+        ../proxy/src/encryption_engine.cpp
+        ../proxy/src/encryption_engine.h
 
         ../libstorage/src/storage_interface.h
         ../libstorage/src/redis.h

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 << "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/waffleClient/cmakebuild/CMakeFiles/Makefile2 b/waffleClient/cmakebuild/CMakeFiles/Makefile2
@@ -68,7 +68,7 @@ CMakeFiles/thrift_ep.dir/all: CMakeFiles/boost_ep.dir/all
 CMakeFiles/thrift_ep.dir/all: CMakeFiles/openssl_ep.dir/all
 	$(MAKE) -f CMakeFiles/thrift_ep.dir/build.make CMakeFiles/thrift_ep.dir/depend
 	$(MAKE) -f CMakeFiles/thrift_ep.dir/build.make CMakeFiles/thrift_ep.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/avishekde/Desktop/Sharath_Waffle/waffle_final/waffle_test/waffleClient/cmakebuild/CMakeFiles --progress-num=74,75,76,77,78,79,80,81 "Built target thrift_ep"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/avishekde/Desktop/Sharath_Waffle/waffle_final/waffle_test/waffleClient/cmakebuild/CMakeFiles --progress-num=76,77,78,79,80,81,82,83 "Built target thrift_ep"
 .PHONY : CMakeFiles/thrift_ep.dir/all
 
 # Include target in all.
@@ -365,7 +365,7 @@ benchmark/CMakeFiles/proxy_benchmark.dir/all: CMakeFiles/libcuckoo.dir/all
 benchmark/CMakeFiles/proxy_benchmark.dir/all: CMakeFiles/openssl_ep.dir/all
 	$(MAKE) -f benchmark/CMakeFiles/proxy_benchmark.dir/build.make benchmark/CMakeFiles/proxy_benchmark.dir/depend
 	$(MAKE) -f benchmark/CMakeFiles/proxy_benchmark.dir/build.make benchmark/CMakeFiles/proxy_benchmark.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/avishekde/Desktop/Sharath_Waffle/waffle_final/waffle_test/waffleClient/cmakebuild/CMakeFiles --progress-num=41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58 "Built target proxy_benchmark"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/avishekde/Desktop/Sharath_Waffle/waffle_final/waffle_test/waffleClient/cmakebuild/CMakeFiles --progress-num=41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59 "Built target proxy_benchmark"
 .PHONY : benchmark/CMakeFiles/proxy_benchmark.dir/all
 
 # Include target in all.
@@ -375,7 +375,7 @@ all: benchmark/CMakeFiles/proxy_benchmark.dir/all
 
 # Build rule for subdir invocation for target.
 benchmark/CMakeFiles/proxy_benchmark.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/avishekde/Desktop/Sharath_Waffle/waffle_final/waffle_test/waffleClient/cmakebuild/CMakeFiles 66
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/avishekde/Desktop/Sharath_Waffle/waffle_final/waffle_test/waffleClient/cmakebuild/CMakeFiles 67
 	$(MAKE) -f CMakeFiles/Makefile2 benchmark/CMakeFiles/proxy_benchmark.dir/all
 	$(CMAKE_COMMAND) -E cmake_progress_start /home/avishekde/Desktop/Sharath_Waffle/waffle_final/waffle_test/waffleClient/cmakebuild/CMakeFiles 0
 .PHONY : benchmark/CMakeFiles/proxy_benchmark.dir/rule
@@ -421,7 +421,7 @@ server/CMakeFiles/proxy_server.dir/all: CMakeFiles/thrift_ep.dir/all
 server/CMakeFiles/proxy_server.dir/all: CMakeFiles/libcuckoo.dir/all
 	$(MAKE) -f server/CMakeFiles/proxy_server.dir/build.make server/CMakeFiles/proxy_server.dir/depend
 	$(MAKE) -f server/CMakeFiles/proxy_server.dir/build.make server/CMakeFiles/proxy_server.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/avishekde/Desktop/Sharath_Waffle/waffle_final/waffle_test/waffleClient/cmakebuild/CMakeFiles --progress-num=59,60,61,62,63,64,65,66,67,68,69,70,71,72,73 "Built target proxy_server"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/avishekde/Desktop/Sharath_Waffle/waffle_final/waffle_test/waffleClient/cmakebuild/CMakeFiles --progress-num=60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75 "Built target proxy_server"
 .PHONY : server/CMakeFiles/proxy_server.dir/all
 
 # Include target in all.
@@ -431,7 +431,7 @@ all: server/CMakeFiles/proxy_server.dir/all
 
 # Build rule for subdir invocation for target.
 server/CMakeFiles/proxy_server.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/avishekde/Desktop/Sharath_Waffle/waffle_final/waffle_test/waffleClient/cmakebuild/CMakeFiles 55
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/avishekde/Desktop/Sharath_Waffle/waffle_final/waffle_test/waffleClient/cmakebuild/CMakeFiles 56
 	$(MAKE) -f CMakeFiles/Makefile2 server/CMakeFiles/proxy_server.dir/all
 	$(CMAKE_COMMAND) -E cmake_progress_start /home/avishekde/Desktop/Sharath_Waffle/waffle_final/waffle_test/waffleClient/cmakebuild/CMakeFiles 0
 .PHONY : server/CMakeFiles/proxy_server.dir/rule

diff --git a/waffleClient/cmakebuild/CMakeFiles/progress.marks b/waffleClient/cmakebuild/CMakeFiles/progress.marks
@@ -1 +1 @@
-81
+83
diff --git a/waffleClient/cmakebuild/CMakeFiles/thrift_ep.dir/progress.make b/waffleClient/cmakebuild/CMakeFiles/thrift_ep.dir/progress.make
@@ -1,9 +1,9 @@
-CMAKE_PROGRESS_1 = 74
-CMAKE_PROGRESS_2 = 75
-CMAKE_PROGRESS_3 = 76
-CMAKE_PROGRESS_4 = 77
-CMAKE_PROGRESS_5 = 78
-CMAKE_PROGRESS_6 = 79
-CMAKE_PROGRESS_7 = 80
-CMAKE_PROGRESS_8 = 81
+CMAKE_PROGRESS_1 = 76
+CMAKE_PROGRESS_2 = 77
+CMAKE_PROGRESS_3 = 78
+CMAKE_PROGRESS_4 = 79
+CMAKE_PROGRESS_5 = 80
+CMAKE_PROGRESS_6 = 81
+CMAKE_PROGRESS_7 = 82
+CMAKE_PROGRESS_8 = 83
 
diff --git a/waffleClient/cmakebuild/benchmark/CMakeFiles/progress.marks b/waffleClient/cmakebuild/benchmark/CMakeFiles/progress.marks
@@ -1 +1 @@
-66
+67