aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/testbed_api.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-02-04 16:06:16 +0000
committerChristian Grothoff <christian@grothoff.org>2013-02-04 16:06:16 +0000
commitad376cd585fea449457b9339f5ae39b74d5dd5a0 (patch)
tree9436ac32cf5c7469731cb81673934aef7e02d474 /src/testbed/testbed_api.c
parentc895554bedd8577714d0ac4b6d9aade513f46c61 (diff)
downloadgnunet-ad376cd585fea449457b9339f5ae39b74d5dd5a0.tar.gz
gnunet-ad376cd585fea449457b9339f5ae39b74d5dd5a0.zip
-trying to fix low parallelism bias
Diffstat (limited to 'src/testbed/testbed_api.c')
-rw-r--r--src/testbed/testbed_api.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 1108ff15a..bf9f18a38 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -2635,9 +2635,12 @@ decide_npoc (struct GNUNET_TESTBED_Controller *c)
2635 avg = GNUNET_TIME_relative_divide (avg, nvals); 2635 avg = GNUNET_TIME_relative_divide (avg, nvals);
2636 GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value != avg.rel_value); 2636 GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value != avg.rel_value);
2637 sd = SD_deviation_factor (c->poc_sd, (unsigned int) avg.rel_value); 2637 sd = SD_deviation_factor (c->poc_sd, (unsigned int) avg.rel_value);
2638 if ( (sd <= 5) ||
2639 (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
2640 c->num_parallel_connects)) )
2641 SD_add_data (c->poc_sd, (unsigned int) avg.rel_value);
2638 if (GNUNET_SYSERR == sd) 2642 if (GNUNET_SYSERR == sd)
2639 { 2643 {
2640 SD_add_data (c->poc_sd, (unsigned int) avg.rel_value);
2641 GNUNET_TESTBED_set_num_parallel_overlay_connects_ (c, 2644 GNUNET_TESTBED_set_num_parallel_overlay_connects_ (c,
2642 c->num_parallel_connects); 2645 c->num_parallel_connects);
2643 return; 2646 return;
@@ -2645,7 +2648,6 @@ decide_npoc (struct GNUNET_TESTBED_Controller *c)
2645 GNUNET_assert (0 <= sd); 2648 GNUNET_assert (0 <= sd);
2646 if (0 == sd) 2649 if (0 == sd)
2647 { 2650 {
2648 SD_add_data (c->poc_sd, (unsigned int) avg.rel_value);
2649 GNUNET_TESTBED_set_num_parallel_overlay_connects_ (c, 2651 GNUNET_TESTBED_set_num_parallel_overlay_connects_ (c,
2650 c->num_parallel_connects 2652 c->num_parallel_connects
2651 * 2); 2653 * 2);
@@ -2653,7 +2655,6 @@ decide_npoc (struct GNUNET_TESTBED_Controller *c)
2653 } 2655 }
2654 if (1 == sd) 2656 if (1 == sd)
2655 { 2657 {
2656 SD_add_data (c->poc_sd, (unsigned int) avg.rel_value);
2657 GNUNET_TESTBED_set_num_parallel_overlay_connects_ (c, 2658 GNUNET_TESTBED_set_num_parallel_overlay_connects_ (c,
2658 c->num_parallel_connects 2659 c->num_parallel_connects
2659 + 1); 2660 + 1);
@@ -2666,7 +2667,6 @@ decide_npoc (struct GNUNET_TESTBED_Controller *c)
2666 } 2667 }
2667 if (2 == sd) 2668 if (2 == sd)
2668 { 2669 {
2669 SD_add_data (c->poc_sd, (unsigned int) avg.rel_value);
2670 GNUNET_TESTBED_set_num_parallel_overlay_connects_ (c, 2670 GNUNET_TESTBED_set_num_parallel_overlay_connects_ (c,
2671 c->num_parallel_connects 2671 c->num_parallel_connects
2672 - 1); 2672 - 1);