Changes to run_experiments and gen_enclave_config

gen_enclave_config.py

@@ -31,7 +31,7 @@ def generate_config(N, M, T, B):
     # 4 Buffers of clients_per_server items of B size each
     heap_size += (clients_per_server * B * 5)
     # 3 x WN
-    heap_size += (3 * T * (clients_per_server * math.ceil(math.log(clients_per_server,2)) * 8))
+    heap_size += (5 * T * (clients_per_server * math.ceil(math.log(clients_per_server,2)) * 8))
     # 60 MB
     #heap_size += 60000000
     heap_size_page_aligned = math.ceil(heap_size/4096) * 4096

run_experiments.py

@@ -23,7 +23,7 @@ from gen_enclave_config import generate_config
 
 MANIFEST_FILE = "App/manifest.yaml"
 #MANIFESTS_FOLDER = "Manifests/"
-LOG_FOLDER = "Experiments_Plot_170424_Final/"
+LOG_FOLDER = "Experiments_test"
 RESULT_FOLDER = "Experiment_results/"
 
 '''
@@ -53,8 +53,8 @@ B = 256
 ###############################################################################
 
 def epoch_time(n, m, t, b):
-    # Base epoch time is 5 sec
-    etime_base = 5
+    # Base epoch time is 15 sec
+    etime_base = 15
     clients_per_server = math.ceil(n/m)
     # Using 1 sec for ~50K clients in compute time
     # Using 8 sec for 2^20 clients in route_compute time as the base for calculations below
@@ -63,19 +63,14 @@ def epoch_time(n, m, t, b):
     etime_route_compute = 0.8 * math.ceil(clients_per_server/100000)
     etime_precompute = 1.5 * math.ceil(clients_per_server/100000)
 
-    # If we have less than 3 threads the precompute happens sequentially
-    # so epoch_interval needs to account for all the precompute
-    #if(t < 3):
-    #    etime_precompute *=3
+    # Costs for Waksman network precompute
+    # Public routing needs 5 WN, private routing needs 3 WNs
+    etime_precompute *=5
 
     # Client time:
     # Takes about 30 sec for handling 2^20 clients
-    etime_client = math.ceil(clients_per_server/100000) * 3
-    #if(t>3):
-    #    etime_client/=(t/4)
+    etime_client = math.ceil(clients_per_server/100000) * 5
 
-    #etime_inc = math.ceil(clients_per_server/25000)
-    #etime_client = ((math.ceil(2/t))**2) * etime_inc
     etime = etime_base + etime_precompute + etime_route_compute + etime_client
     return int(etime)