[gnunet] 125/164: Removed unusable counter

[gnunet]

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

grothoff pushed a commit to branch master
in repository gnunet.

commit 0e4b63b5aaa6a585802811f6f018f0443beecedc
Author: Elias Summermatter <elias.summermatter@seccom.ch>
AuthorDate: Sun May 30 16:45:56 2021 +0200

    Removed unusable counter
---
 src/setu/gnunet-service-setu.c | 25 +++++++++++--------------
 src/setu/perf_setu_api.c       |  2 +-
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index 036fd973c..96ea446a2 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -507,10 +507,6 @@ struct Operation
     */
     struct GNUNET_CONTAINER_MultiHashMap *inquiries_sent;
 
-    /**
-     * Number of element in local set
-     */
-    uint64_t number_elements_local;
 
     /**
     * Total size of local set
@@ -1222,7 +1218,6 @@ determinate_avg_element_size_iterator (void *cls,
 {
     struct Operation *op = cls;
     struct GNUNET_SETU_Element *element = value;
-    op->number_elements_local += 1;
     op->total_elements_size_local += element->size;
     return GNUNET_YES;
 }
@@ -2242,7 +2237,7 @@ handle_union_p2p_strata_estimator (void *cls,
       GNUNET_CONTAINER_multihashmap_iterate(op->set->content->elements,
                                             
&determinate_avg_element_size_iterator,
                                             op);
-      avg_element_size = op->total_elements_size_local / 
op->number_elements_local;
+      avg_element_size = op->total_elements_size_local / 
op->local_element_count;
   }
 
   op->mode_of_operation = estimate_best_mode_of_operation(avg_element_size,
@@ -2709,20 +2704,21 @@ handle_union_p2p_send_full (void *cls,
     }
 
     /** Calculate avg element size if not initial sync **/
+    op->local_element_count = GNUNET_CONTAINER_multihashmap_size(
+            op->set->content->elements);
     uint64_t avg_element_size = 0;
-    if(0 < op->number_elements_local) {
+    if(0 < op->local_element_count) {
 
         GNUNET_CONTAINER_multihashmap_iterate (op->set->content->elements,
                                                
&determinate_avg_element_size_iterator,
                                                op);
-        avg_element_size = op->total_elements_size_local / 
op->number_elements_local;
+        avg_element_size = op->total_elements_size_local / 
op->local_element_count;
     }
 
     /** Validate mode of operation **/
     int mode_of_operation = estimate_best_mode_of_operation(avg_element_size,
                                                             
op->remote_element_count,
-                                                            
GNUNET_CONTAINER_multihashmap_size(
-                                                                    
op->set->content->elements),
+                                                            
op->local_element_count,
                                                             
op->remote_set_diff,
                                                             op->local_set_diff,
                                                             
op->rtt_bandwidth_tradeoff,
@@ -3432,18 +3428,19 @@ handle_union_p2p_request_full (void *cls,
        "Received request for full set transmission\n");
 
   /** Calculate avg element size if not initial sync **/
+  op->local_element_count = GNUNET_CONTAINER_multihashmap_size(
+            op->set->content->elements);
   uint64_t avg_element_size = 0;
-  if(0 < op->number_elements_local) {
+  if(0 < op->local_element_count) {
       GNUNET_CONTAINER_multihashmap_iterate (op->set->content->elements,
                                              
&determinate_avg_element_size_iterator,
                                              op);
-      avg_element_size = op->total_elements_size_local / 
op->number_elements_local;
+      avg_element_size = op->total_elements_size_local / 
op->local_element_count;
   }
 
   int mode_of_operation = estimate_best_mode_of_operation(avg_element_size,
                                                           
op->remote_element_count,
-                                                          
GNUNET_CONTAINER_multihashmap_size(
-                                                                  
op->set->content->elements),
+                                                          
op->local_element_count,
                                                           op->remote_set_diff,
                                                           op->local_set_diff,
                                                           
op->rtt_bandwidth_tradeoff,
diff --git a/src/setu/perf_setu_api.c b/src/setu/perf_setu_api.c
index c47bd8f66..76417fdfc 100644
--- a/src/setu/perf_setu_api.c
+++ b/src/setu/perf_setu_api.c
@@ -405,7 +405,7 @@ run (void *cls,
                 "Running real set-reconciliation\n");
     //init_set1 ();
     // limit ~23800 element total
-    initRandomSets(470, 500,500,32);
+    initRandomSets(45, 500,500,32);
 }
 
 void perf_thread() {

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