Tweaks to handle public/private routing

Enclave/route.cpp

@@ -122,9 +122,15 @@ bool route_init()
     }
     if (my_roles & ROLE_ROUTING) {
         sort_precompute_evalplan(max_round2_msgs, nthreads);
+        if(!g_teems_config.private_routing) {
+            sort_precompute_evalplan(max_round2_msgs, nthreads);
+        }
     }
     if (my_roles & ROLE_STORAGE) {
         sort_precompute_evalplan(max_stg_msgs, nthreads);
+        if(!g_teems_config.private_routing) {
+            sort_precompute_evalplan(max_stg_msgs, nthreads);
+        }
     }
 #ifdef PROFILE_ROUTING
     printf_with_rtclock_diff(start, "end precompute evalplans\n");
@@ -174,9 +180,15 @@ size_t ecall_precompute_sort(int sizeidx)
         }
         if (my_roles & ROLE_ROUTING) {
             used_sizes.push_back(route_state.max_round2_msgs);
+            if(!g_teems_config.private_routing) {
+                used_sizes.push_back(route_state.max_round2_msgs);
+            }
         }
         if (my_roles & ROLE_STORAGE) {
             used_sizes.push_back(route_state.max_stg_msgs);
+            if(!g_teems_config.private_routing) {
+                used_sizes.push_back(route_state.max_stg_msgs);
+            }
         }
         ret = used_sizes.size();
     }
@@ -711,13 +723,9 @@ void ecall_routing_proceed(void *cbpointer)
                 pthread_mutex_lock(&round2.mutex);
             }
 
-#ifdef PROFILE_ROUTING
             unsigned long start = printf_with_rtclock("begin storage processing (%u)\n", round2.inserted);
-#endif
             storage_received(round2);
-#ifdef PROFILE_ROUTING
             printf_with_rtclock_diff(start, "end storage processing (%u)\n", round2.inserted);
-#endif
 
             // We're done
             route_state.step = ROUTE_NOT_STARTED;