[gnunet] 115/164: Prepare fore messurement 1

[gnunet]

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

grothoff pushed a commit to branch master
in repository gnunet.

commit 55af3e12a96c0289600ba79e19ac8681f521cc25
Author: Elias Summermatter <elias.summermatter@seccom.ch>
AuthorDate: Thu May 27 09:53:33 2021 +0200

    Prepare fore messurement 1
---
 src/setu/gnunet-service-setu.c                  | 6 ++----
 src/setu/gnunet-service-setu_strata_estimator.c | 6 ++++--
 src/setu/gnunet-service-setu_strata_estimator.h | 2 ++
 src/setu/perf_setu_api.c                        | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index 9b2aee8b0..2f84b0cc2 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -56,9 +56,9 @@
 #define SE_IBF_SIZE 79
 
 /**
- * Primes for all 4 different strata estimators 79,83,89,97 348
+ * Primes for all 4 different strata estimators 61,67,71,73,79,83,89,97 348
  */
-#define SE_IBFS_TOTAL_SIZE 348
+#define SE_IBFS_TOTAL_SIZE 79
 
 /**
  * The hash num parameter for the difference digests and strata estimators.
@@ -1444,7 +1444,6 @@ full_sync_plausibility_check (struct Operation *op) {
     /*
      * Protect full sync from receiving double element when in FULL SENDING
      */
-
     if(GNUNET_YES == op->byzantine && PHASE_FULL_SENDING == op->phase) {
         if(duplicates > 0)
         {
@@ -3013,7 +3012,6 @@ handle_union_p2p_full_element (void *cls,
     send_client_element (op,
                          &ee->element,
                          GNUNET_SETU_STATUS_ADD_LOCAL);
-    full_sync_plausibility_check(op);
   }
 
 
diff --git a/src/setu/gnunet-service-setu_strata_estimator.c 
b/src/setu/gnunet-service-setu_strata_estimator.c
index 5111dd712..ad0ee24e8 100644
--- a/src/setu/gnunet-service-setu_strata_estimator.c
+++ b/src/setu/gnunet-service-setu_strata_estimator.c
@@ -38,6 +38,7 @@
  */
 size_t
 strata_estimator_write (const struct MultiStrataEstimator *se,
+                        uint16_t se_ibf_total_size,
                         void *buf)
 {
   char *sbuf = buf;
@@ -89,6 +90,7 @@ int
 strata_estimator_read (const void *buf,
                        size_t buf_len,
                        int is_compressed,
+                       uint16_t se_ibf_total_size,
                        struct MultiStrataEstimator *se)
 {
   size_t osize;
@@ -97,7 +99,7 @@ strata_estimator_read (const void *buf,
   dbuf = NULL;
   if (GNUNET_YES == is_compressed)
   {
-    osize = SE_IBFS_TOTAL_SIZE * IBF_BUCKET_SIZE * 
se->stratas[0]->strata_count;
+    osize = se_ibf_total_size * IBF_BUCKET_SIZE * se->stratas[0]->strata_count;
     dbuf = GNUNET_decompress (buf,
                               buf_len,
                               osize);
@@ -110,7 +112,7 @@ strata_estimator_read (const void *buf,
     buf_len = osize;
   }
 
-  if (buf_len != se->stratas[0]->strata_count * SE_IBFS_TOTAL_SIZE * 
IBF_BUCKET_SIZE)
+  if (buf_len != se->stratas[0]->strata_count * se_ibf_total_size * 
IBF_BUCKET_SIZE)
   {
     GNUNET_break (0);  /* very odd error */
     GNUNET_free (dbuf);
diff --git a/src/setu/gnunet-service-setu_strata_estimator.h 
b/src/setu/gnunet-service-setu_strata_estimator.h
index 8c45d01ca..401f6ed61 100644
--- a/src/setu/gnunet-service-setu_strata_estimator.h
+++ b/src/setu/gnunet-service-setu_strata_estimator.h
@@ -80,6 +80,7 @@ struct MultiStrataEstimator
  */
 size_t
 strata_estimator_write (const struct MultiStrataEstimator *se,
+                        uint16_t se_ibf_total_size,
                         void *buf);
 
 
@@ -97,6 +98,7 @@ int
 strata_estimator_read (const void *buf,
                        size_t buf_len,
                        int is_compressed,
+                       uint16_t se_ibf_total_size,
                        struct MultiStrataEstimator *se);
 
 
diff --git a/src/setu/perf_setu_api.c b/src/setu/perf_setu_api.c
index 7f954c082..724a13ba4 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(450, 500,500,32);
+    initRandomSets(45, 500,500,32);
 }
 
 void perf_thread() {
@@ -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(1010000);
+            run_petf_thread(101000);
         }
     }
     return 0;

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