[gnunet] 25/164: Simulation with 10x less elements & Removed some debuging statements

[gnunet]

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

grothoff pushed a commit to branch master
in repository gnunet.

commit a63df143fc0d9ac6e01fa30d0e06d30f882fb257
Author: Elias Summermatter <elias.summermatter@seccom.ch>
AuthorDate: Tue Apr 13 20:15:12 2021 +0200

    Simulation with 10x less elements & Removed some debuging statements
---
 src/setu/gnunet-service-setu.c | 14 +-------------
 src/setu/perf_setu_api.c       |  6 +++---
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index c06fa6572..941c948b3 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -726,7 +726,6 @@ sum_sent_received_bytes(int size, struct 
perf_num_send_resived_msg perf_rtt_stru
 static float
 calculate_perf_rtt() {
 
-    LOG(GNUNET_ERROR_TYPE_ERROR,"CALCUALATE PERFOMANCE VALUES\n");
     /**
      *  Calculate RTT of init phase normally always 1
      */
@@ -748,7 +747,6 @@ calculate_perf_rtt() {
      *  In case of a differential sync 3 rtt's are needed.
      *  for every active/passive switch additional 3.5 rtt's are used
      */
-    LOG(GNUNET_ERROR_TYPE_ERROR,"ITER: %d\n",  
perf_rtt.active_passive_switches);
     if (( perf_rtt.element.received != 0 ) ||
         ( perf_rtt.element.sent != 0)) {
         int iterations = perf_rtt.active_passive_switches;
@@ -773,13 +771,6 @@ calculate_perf_rtt() {
     bytes_transmitted += 
sum_sent_received_bytes(sizeof(GNUNET_MESSAGE_TYPE_SETU_P2P_OFFER), 
perf_rtt.offer);
     bytes_transmitted += 
sum_sent_received_bytes(sizeof(GNUNET_MESSAGE_TYPE_SETU_P2P_DONE), 
perf_rtt.done);
 
-    LOG(GNUNET_ERROR_TYPE_DEBUG,"Bytes Transmitted: %d\n", bytes_transmitted);
-
-    LOG(GNUNET_ERROR_TYPE_DEBUG,"Reached tradeoff bandwidth/rtt: %f\n", 
(bytes_transmitted / rtt ));
-
-    LOG(GNUNET_ERROR_TYPE_ERROR,"Estimateded set difference: %d\n", 
perf_rtt.se_diff);
-
-
 
     /*
      * Write IBF failure rate for different BUCKET_NUMBER_FACTOR
@@ -793,7 +784,6 @@ calculate_perf_rtt() {
     int decoded = 0;
     if(perf_rtt.active_passive_switches == 0)
         decoded = 1;
-    LOG(GNUNET_ERROR_TYPE_ERROR,"decoded=%d, msg_sent=%d, msg_recv=%d, 
byte_sent=%d, bytes_recv=%d \n", decoded, perf_rtt.ibf.sent, 
perf_rtt.ibf.received, perf_rtt.ibf.sent_var_bytes, 
perf_rtt.ibf.received_var_bytes);
     int ibf_bytes_transmitted = 
sum_sent_received_bytes(sizeof(GNUNET_MESSAGE_TYPE_SETU_P2P_IBF), perf_rtt.ibf);
 
 
@@ -1831,14 +1821,12 @@ decode_and_send (struct Operation *op)
       uint32_t next_size;
       /** Enforce odd ibf size **/
 
-        LOG (GNUNET_ERROR_TYPE_ERROR,
-             "INT::: %d\n", (( diff_ibf->size * 2) | 1));
 
       next_size = ( diff_ibf->size * 2) | 1;
 
       if (next_size > diff_ibf->size) /** FIXME: ADD HERA A MAX LIMIT! if 
(next_order <= MAX_IBF_ORDER) **/
       {
-        LOG (GNUNET_ERROR_TYPE_ERROR,
+        LOG (GNUNET_ERROR_TYPE_DEBUG,
              "decoding failed, sending larger ibf (size %u)\n",
              next_size);
         GNUNET_STATISTICS_update (_GSS_statistics,
diff --git a/src/setu/perf_setu_api.c b/src/setu/perf_setu_api.c
index 32292af2b..210899c8a 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(5,50,50,32);
 }
 
 void perf_thread() {
@@ -447,9 +447,9 @@ static void execute_perf() {
     //FILE *out = fopen("perfstats.log", "w");
     //fprintf(out, "se_diff,active_passive_switches,bytes_transmitted,rtt\n");
 
-    for (int out_out_ctr = 1; out_out_ctr <= 10; out_out_ctr++) {
+    for (int out_out_ctr = 2; out_out_ctr <= 6; out_out_ctr++) {
 
-        for (int out_ctr = 1; out_ctr <= 100; out_ctr++) {
+        for (int out_ctr = 5; out_ctr <= 50; out_ctr++) {
 
             float base = 0.1;
             float x = out_ctr * base;

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