[gnunet] 112/164: Baseline for salt optimization

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet.

commit 88e36773958d71fb77b6da05a7d07dda7f664ab9
Author: Elias Summermatter <elias.summermatter@seccom.ch>
AuthorDate: Wed May 26 14:04:48 2021 +0200

    Baseline for salt optimization
---
 src/setu/gnunet-service-setu.c                  |  4 ++--
 src/setu/gnunet-service-setu_strata_estimator.c | 10 +++++-----
 src/setu/perf_setu_api.c                        |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index 3531e930a..59222b2b1 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -992,9 +992,9 @@ estimate_best_mode_of_operation(uint64_t avg_element_size,
     if (full_min < total_bytes_diff) {
         /* Decide between sending all element first or receiving all elements 
*/
         if (total_bytes_full_remote_send_first > 
total_bytes_full_local_send_first) {
-            return FULL_SYNC_LOCAL_SENDING_FIRST;
+            return DIFFERENTIAL_SYNC; // FULL_SYNC_LOCAL_SENDING_FIRST;
         } else {
-            return FULL_SYNC_REMOTE_SENDING_FIRST;
+            return DIFFERENTIAL_SYNC; // FULL_SYNC_REMOTE_SENDING_FIRST;
         }
     } else {
         return DIFFERENTIAL_SYNC;
diff --git a/src/setu/gnunet-service-setu_strata_estimator.c 
b/src/setu/gnunet-service-setu_strata_estimator.c
index 30972f52c..5111dd712 100644
--- a/src/setu/gnunet-service-setu_strata_estimator.c
+++ b/src/setu/gnunet-service-setu_strata_estimator.c
@@ -140,13 +140,13 @@ strata_estimator_insert (struct MultiStrataEstimator *se,
 
 
   /* count trailing '1'-bits of v */
-  for(int strata_ctr=0; strata_ctr < 4; strata_ctr++) {
+  for(int strata_ctr=0; strata_ctr < SE_SE_COUNT; strata_ctr++) {
       unsigned int i;
       uint64_t v;
 
       struct IBF_Key salted_key;
       salt_key (&key,
-                strata_ctr * 16 ,
+                strata_ctr * (64 / SE_SE_COUNT),
                 &salted_key);
       v = salted_key.key_val;
       for (i = 0; v & 1; v >>= 1, i++) {
@@ -170,7 +170,7 @@ strata_estimator_remove (struct MultiStrataEstimator *se,
 {
 
   /* count trailing '1'-bits of v */
-  for(int strata_ctr=0; strata_ctr < 4; strata_ctr++) {
+  for(int strata_ctr=0; strata_ctr < SE_SE_COUNT; strata_ctr++) {
       uint64_t v;
       unsigned int i;
       v = key.key_val;
@@ -277,8 +277,8 @@ strata_estimator_difference (const struct 
MultiStrataEstimator *se1,
   }
   //GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "TOTAL LOCAL: %u\n",avg_local_diff);
   //GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "TOTAL REMOTE: %u\n",avg_remote_diff);
-  se1->stratas[0]->strata[0]->local_decoded_count = avg_local_diff / 4;
-  se1->stratas[0]->strata[0]->remote_decoded_count = avg_remote_diff / 4;
+  se1->stratas[0]->strata[0]->local_decoded_count = avg_local_diff / 
SE_SE_COUNT;
+  se1->stratas[0]->strata[0]->remote_decoded_count = avg_remote_diff / 
SE_SE_COUNT;
 }
 
 
diff --git a/src/setu/perf_setu_api.c b/src/setu/perf_setu_api.c
index fad9baf68..7f954c082 100644
--- a/src/setu/perf_setu_api.c
+++ b/src/setu/perf_setu_api.c
@@ -404,7 +404,7 @@ run (void *cls,
                 "Running real set-reconciliation\n");
     //init_set1 ();
     // limit ~23800 element total
-    initRandomSets(45, 500,500,32);
+    initRandomSets(450, 500,500,32);
 }
 
 void perf_thread() {
@@ -466,7 +466,7 @@ static void execute_perf() {
             setu_cfg = GNUNET_CONFIGURATION_create();
             GNUNET_CONFIGURATION_set_value_string(setu_cfg, "IBF", 
"BUCKET_NUMBER_FACTOR", factor); // Factor default=4
             GNUNET_CONFIGURATION_set_value_number(setu_cfg, "IBF", 
"NUMBER_PER_BUCKET", 3); // K default=4
-            GNUNET_CONFIGURATION_set_value_string(setu_cfg, "PERFORMANCE", 
"TRADEOFF", tradeoff); //default=0.25
+            GNUNET_CONFIGURATION_set_value_string(setu_cfg, "PERFORMANCE", 
"TRADEOFF", "0"); //default=0.25
             GNUNET_CONFIGURATION_set_value_string(setu_cfg, "PERFORMANCE", 
"MAX_SET_DIFF_FACTOR_DIFFERENTIAL",
                                                   "20000");//default=0.25
             GNUNET_CONFIGURATION_set_value_number(setu_cfg, "BOUNDARIES", 
"UPPER_ELEMENT",5000);
@@ -477,7 +477,7 @@ static void execute_perf() {
                         GNUNET_ERROR_TYPE_ERROR,
                         _("Failed to write subsystem default identifier map to 
`%s'.\n"),
                         setu_cfg);
-            run_petf_thread(10000000);
+            run_petf_thread(1010000);
         }
     }
     return 0;

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.