diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-10-26 22:13:01 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-10-26 22:13:01 +0000 |
commit | 64d3e46cfb99a711e500fa1f114e7c44bdf10040 (patch) | |
tree | 83093d92761d5c1b8b2fded713adaa19af29274c /src/arm | |
parent | ef6f05f63769263a5201636c4b7f71eaa455cdf3 (diff) | |
download | gnunet-64d3e46cfb99a711e500fa1f114e7c44bdf10040.tar.gz gnunet-64d3e46cfb99a711e500fa1f114e7c44bdf10040.zip |
-bugfixes, code cleanup
Diffstat (limited to 'src/arm')
-rw-r--r-- | src/arm/gnunet-service-arm.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index b43a482ba..5ad409681 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c | |||
@@ -30,12 +30,6 @@ | |||
30 | #include "arm.h" | 30 | #include "arm.h" |
31 | 31 | ||
32 | /** | 32 | /** |
33 | * Threshold after which exponential backoff shouldn't increase (in ms); 30m | ||
34 | */ | ||
35 | #define EXPONENTIAL_BACKOFF_THRESHOLD GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 30) | ||
36 | |||
37 | |||
38 | /** | ||
39 | * List of our services. | 33 | * List of our services. |
40 | */ | 34 | */ |
41 | struct ServiceList; | 35 | struct ServiceList; |
@@ -1023,10 +1017,7 @@ maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1023 | pos->name, statstr, statcode, pos->backoff.rel_value); | 1017 | pos->name, statstr, statcode, pos->backoff.rel_value); |
1024 | /* schedule restart */ | 1018 | /* schedule restart */ |
1025 | pos->restart_at = GNUNET_TIME_relative_to_absolute (pos->backoff); | 1019 | pos->restart_at = GNUNET_TIME_relative_to_absolute (pos->backoff); |
1026 | pos->backoff = | 1020 | pos->backoff = GNUNET_TIME_STD_BACKOFF (pos->backoff); |
1027 | GNUNET_TIME_relative_min (EXPONENTIAL_BACKOFF_THRESHOLD, | ||
1028 | GNUNET_TIME_relative_multiply | ||
1029 | (pos->backoff, 2)); | ||
1030 | } | 1021 | } |
1031 | if (GNUNET_SCHEDULER_NO_TASK != child_restart_task) | 1022 | if (GNUNET_SCHEDULER_NO_TASK != child_restart_task) |
1032 | GNUNET_SCHEDULER_cancel (child_restart_task); | 1023 | GNUNET_SCHEDULER_cancel (child_restart_task); |