summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElias Summermatter <elias.summermatter@seccom.ch>2021-04-07 22:50:35 +0200
committerElias Summermatter <elias.summermatter@seccom.ch>2021-04-07 22:50:35 +0200
commita3ba11f549f20d09c988122899638e0a8a9dcc09 (patch)
tree617bae8e1d79c8f95a93dff997e9bae0a14fe9c4
parent61e4e3d82ac380e585f8a44110bbc3689cd940bd (diff)
Run over night
-rw-r--r--src/setu/gnunet-service-setu.c9
-rw-r--r--src/setu/perf_setu_api.c2
2 files changed, 8 insertions, 3 deletions
diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index 02e1f5d15..7569e3258 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -748,9 +748,11 @@ 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;
+
if(iterations > 0)
rtt += iterations * 0.5;
rtt += 2.5;
@@ -796,7 +798,7 @@ calculate_perf_rtt() {
FILE *out1 = fopen("perf_failure_bucket_number_factor.csv", "a");
- fprintf(out1, "%d,%f,%d,%d\n",num_per_bucket,factor,decoded,ibf_bytes_transmitted);
+ fprintf(out1, "%d,%f,%d,%d,%f,%d\n",num_per_bucket,factor,decoded,ibf_bytes_transmitted,rtt,perf_rtt.se_diff);
fclose(out1);
@@ -1831,6 +1833,7 @@ decode_and_send (struct Operation *op)
while (1 << next_order < diff_ibf->size)
next_order++;
next_order++;
+
if (next_order <= MAX_IBF_ORDER)
{
LOG (GNUNET_ERROR_TYPE_ERROR,
@@ -1841,7 +1844,9 @@ decode_and_send (struct Operation *op)
1,
GNUNET_NO);
perf_rtt.active_passive_switches += 1;
- op->salt_send++;
+
+ op->salt_send += 1;
+
if (GNUNET_OK !=
send_ibf (op, next_order))
{
diff --git a/src/setu/perf_setu_api.c b/src/setu/perf_setu_api.c
index f9d2dba18..1deb69202 100644
--- a/src/setu/perf_setu_api.c
+++ b/src/setu/perf_setu_api.c
@@ -447,7 +447,7 @@ 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 = 7; out_out_ctr <= 10; out_out_ctr++) {
+ for (int out_out_ctr = 1; out_out_ctr <= 10; out_out_ctr++) {
for (int out_ctr = 10; out_ctr <= 60; out_ctr++) {