aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElias Summermatter <elias.summermatter@seccom.ch>2021-03-31 22:58:18 +0200
committerElias Summermatter <elias.summermatter@seccom.ch>2021-03-31 22:58:18 +0200
commitb26733024c73d991777b2a6546d1f7454aa9a33c (patch)
tree3a44328ba62e828552d21c1aa853abf471b1b348
parent2b242e3c756742cdd2ea867980f67d0f55f916f9 (diff)
downloadgnunet-b26733024c73d991777b2a6546d1f7454aa9a33c.tar.gz
gnunet-b26733024c73d991777b2a6546d1f7454aa9a33c.zip
Fixed bug in rtt counter setu
-rw-r--r--src/setu/gnunet-service-setu.c3
-rw-r--r--src/setu/perf_setu_api.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index 58717909e..b3cbf6d0e 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -695,7 +695,7 @@ calculate_perf_rtt() {
695 * for every active/passive switch additional 3.5 rtt's are used 695 * for every active/passive switch additional 3.5 rtt's are used
696 */ 696 */
697 697
698 float iterations = perf_rtt.ibf.received; 698 int iterations = perf_rtt.ibf.received;
699 if(iterations > 1) 699 if(iterations > 1)
700 rtt += (iterations - 1 ) * 0.5; 700 rtt += (iterations - 1 ) * 0.5;
701 rtt += 3 * iterations; 701 rtt += 3 * iterations;
@@ -717,6 +717,7 @@ calculate_perf_rtt() {
717 717
718 LOG(GNUNET_ERROR_TYPE_ERROR,"Bytes Transmitted: %d\n", bytes_transmitted); 718 LOG(GNUNET_ERROR_TYPE_ERROR,"Bytes Transmitted: %d\n", bytes_transmitted);
719 719
720 LOG(GNUNET_ERROR_TYPE_ERROR,"Reached tradeoff bandwidth/rtt: %f\n", (bytes_transmitted / rtt ));
720 721
721 return rtt; 722 return rtt;
722} 723}
diff --git a/src/setu/perf_setu_api.c b/src/setu/perf_setu_api.c
index 990e69ea8..73b61c02a 100644
--- a/src/setu/perf_setu_api.c
+++ b/src/setu/perf_setu_api.c
@@ -395,7 +395,7 @@ run (void *cls,
395 "Running real set-reconciliation\n"); 395 "Running real set-reconciliation\n");
396 //init_set1 (); 396 //init_set1 ();
397 // limit ~23800 element total 397 // limit ~23800 element total
398 initRandomSets(0,200,400,32); 398 initRandomSets(88,100,90,32);
399} 399}
400 400
401static void execute_perf() 401static void execute_perf()