diff options
author | Elias Summermatter <elias.summermatter@seccom.ch> | 2021-04-07 22:50:35 +0200 |
---|---|---|
committer | Elias Summermatter <elias.summermatter@seccom.ch> | 2021-04-07 22:50:35 +0200 |
commit | a3ba11f549f20d09c988122899638e0a8a9dcc09 (patch) | |
tree | 617bae8e1d79c8f95a93dff997e9bae0a14fe9c4 | |
parent | 61e4e3d82ac380e585f8a44110bbc3689cd940bd (diff) | |
download | gnunet-a3ba11f549f20d09c988122899638e0a8a9dcc09.tar.gz gnunet-a3ba11f549f20d09c988122899638e0a8a9dcc09.zip |
Run over night
-rw-r--r-- | src/setu/gnunet-service-setu.c | 9 | ||||
-rw-r--r-- | src/setu/perf_setu_api.c | 2 |
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() { | |||
748 | * In case of a differential sync 3 rtt's are needed. | 748 | * In case of a differential sync 3 rtt's are needed. |
749 | * for every active/passive switch additional 3.5 rtt's are used | 749 | * for every active/passive switch additional 3.5 rtt's are used |
750 | */ | 750 | */ |
751 | LOG(GNUNET_ERROR_TYPE_ERROR,"ITER: %d\n", perf_rtt.active_passive_switches); | ||
751 | if (( perf_rtt.element.received != 0 ) || | 752 | if (( perf_rtt.element.received != 0 ) || |
752 | ( perf_rtt.element.sent != 0)) { | 753 | ( perf_rtt.element.sent != 0)) { |
753 | int iterations = perf_rtt.active_passive_switches; | 754 | int iterations = perf_rtt.active_passive_switches; |
755 | |||
754 | if(iterations > 0) | 756 | if(iterations > 0) |
755 | rtt += iterations * 0.5; | 757 | rtt += iterations * 0.5; |
756 | rtt += 2.5; | 758 | rtt += 2.5; |
@@ -796,7 +798,7 @@ calculate_perf_rtt() { | |||
796 | 798 | ||
797 | 799 | ||
798 | FILE *out1 = fopen("perf_failure_bucket_number_factor.csv", "a"); | 800 | FILE *out1 = fopen("perf_failure_bucket_number_factor.csv", "a"); |
799 | fprintf(out1, "%d,%f,%d,%d\n",num_per_bucket,factor,decoded,ibf_bytes_transmitted); | 801 | fprintf(out1, "%d,%f,%d,%d,%f,%d\n",num_per_bucket,factor,decoded,ibf_bytes_transmitted,rtt,perf_rtt.se_diff); |
800 | fclose(out1); | 802 | fclose(out1); |
801 | 803 | ||
802 | 804 | ||
@@ -1831,6 +1833,7 @@ decode_and_send (struct Operation *op) | |||
1831 | while (1 << next_order < diff_ibf->size) | 1833 | while (1 << next_order < diff_ibf->size) |
1832 | next_order++; | 1834 | next_order++; |
1833 | next_order++; | 1835 | next_order++; |
1836 | |||
1834 | if (next_order <= MAX_IBF_ORDER) | 1837 | if (next_order <= MAX_IBF_ORDER) |
1835 | { | 1838 | { |
1836 | LOG (GNUNET_ERROR_TYPE_ERROR, | 1839 | LOG (GNUNET_ERROR_TYPE_ERROR, |
@@ -1841,7 +1844,9 @@ decode_and_send (struct Operation *op) | |||
1841 | 1, | 1844 | 1, |
1842 | GNUNET_NO); | 1845 | GNUNET_NO); |
1843 | perf_rtt.active_passive_switches += 1; | 1846 | perf_rtt.active_passive_switches += 1; |
1844 | op->salt_send++; | 1847 | |
1848 | op->salt_send += 1; | ||
1849 | |||
1845 | if (GNUNET_OK != | 1850 | if (GNUNET_OK != |
1846 | send_ibf (op, next_order)) | 1851 | send_ibf (op, next_order)) |
1847 | { | 1852 | { |
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() { | |||
447 | //FILE *out = fopen("perfstats.log", "w"); | 447 | //FILE *out = fopen("perfstats.log", "w"); |
448 | //fprintf(out, "se_diff,active_passive_switches,bytes_transmitted,rtt\n"); | 448 | //fprintf(out, "se_diff,active_passive_switches,bytes_transmitted,rtt\n"); |
449 | 449 | ||
450 | for (int out_out_ctr = 7; out_out_ctr <= 10; out_out_ctr++) { | 450 | for (int out_out_ctr = 1; out_out_ctr <= 10; out_out_ctr++) { |
451 | 451 | ||
452 | for (int out_ctr = 10; out_ctr <= 60; out_ctr++) { | 452 | for (int out_ctr = 10; out_ctr <= 60; out_ctr++) { |
453 | 453 | ||