diff options
Diffstat (limited to 'src/arm/gnunet-service-arm.c')
-rw-r--r-- | src/arm/gnunet-service-arm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index 1acb82f72..f5426e176 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c | |||
@@ -1012,8 +1012,7 @@ delayed_restart_task (void *cls, | |||
1012 | if (NULL != sl->proc) | 1012 | if (NULL != sl->proc) |
1013 | continue; | 1013 | continue; |
1014 | /* service is currently not running */ | 1014 | /* service is currently not running */ |
1015 | if (GNUNET_TIME_absolute_get_remaining (sl->restart_at).rel_value == | 1015 | if (0 == GNUNET_TIME_absolute_get_remaining (sl->restart_at).rel_value_us) |
1016 | 0) | ||
1017 | { | 1016 | { |
1018 | /* restart is now allowed */ | 1017 | /* restart is now allowed */ |
1019 | if (sl->is_default) | 1018 | if (sl->is_default) |
@@ -1046,7 +1045,7 @@ delayed_restart_task (void *cls, | |||
1046 | (sl->restart_at)); | 1045 | (sl->restart_at)); |
1047 | } | 1046 | } |
1048 | } | 1047 | } |
1049 | if (lowestRestartDelay.rel_value != GNUNET_TIME_UNIT_FOREVER_REL.rel_value) | 1048 | if (lowestRestartDelay.rel_value_us != GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us) |
1050 | { | 1049 | { |
1051 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1050 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1052 | "Will restart process in %s\n", | 1051 | "Will restart process in %s\n", |
@@ -1126,7 +1125,7 @@ maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1126 | statstr = _( /* process termination method */ "unknown"); | 1125 | statstr = _( /* process termination method */ "unknown"); |
1127 | statcode = 0; | 1126 | statcode = 0; |
1128 | } | 1127 | } |
1129 | if (0 != pos->killed_at.abs_value) | 1128 | if (0 != pos->killed_at.abs_value_us) |
1130 | { | 1129 | { |
1131 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 1130 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
1132 | _("Service `%s' took %s to terminate\n"), | 1131 | _("Service `%s' took %s to terminate\n"), |
@@ -1149,7 +1148,7 @@ maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1149 | if ((statusType == GNUNET_OS_PROCESS_EXITED) && (statcode == 0)) | 1148 | if ((statusType == GNUNET_OS_PROCESS_EXITED) && (statcode == 0)) |
1150 | { | 1149 | { |
1151 | /* process terminated normally, allow restart at any time */ | 1150 | /* process terminated normally, allow restart at any time */ |
1152 | pos->restart_at.abs_value = 0; | 1151 | pos->restart_at.abs_value_us = 0; |
1153 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 1152 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
1154 | _("Service `%s' terminated normally, will restart at any time\n"), | 1153 | _("Service `%s' terminated normally, will restart at any time\n"), |
1155 | pos->name); | 1154 | pos->name); |