diff options
Diffstat (limited to 'src/arm/gnunet-service-arm.c')
-rw-r--r-- | src/arm/gnunet-service-arm.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index c6259c273..630816d1d 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c | |||
@@ -81,7 +81,7 @@ struct ServiceListeningInfo | |||
81 | /** | 81 | /** |
82 | * Task doing the accepting. | 82 | * Task doing the accepting. |
83 | */ | 83 | */ |
84 | GNUNET_SCHEDULER_TaskIdentifier accept_task; | 84 | struct GNUNET_SCHEDULER_Task * accept_task; |
85 | 85 | ||
86 | }; | 86 | }; |
87 | 87 | ||
@@ -200,13 +200,13 @@ static char *final_option; | |||
200 | /** | 200 | /** |
201 | * ID of task called whenever we get a SIGCHILD. | 201 | * ID of task called whenever we get a SIGCHILD. |
202 | */ | 202 | */ |
203 | static GNUNET_SCHEDULER_TaskIdentifier child_death_task; | 203 | static struct GNUNET_SCHEDULER_Task * child_death_task; |
204 | 204 | ||
205 | /** | 205 | /** |
206 | * ID of task called whenever the timeout for restarting a child | 206 | * ID of task called whenever the timeout for restarting a child |
207 | * expires. | 207 | * expires. |
208 | */ | 208 | */ |
209 | static GNUNET_SCHEDULER_TaskIdentifier child_restart_task; | 209 | static struct GNUNET_SCHEDULER_Task * child_restart_task; |
210 | 210 | ||
211 | /** | 211 | /** |
212 | * Pipe used to communicate shutdown via signal. | 212 | * Pipe used to communicate shutdown via signal. |
@@ -421,10 +421,10 @@ start_process (struct ServiceList *sl, | |||
421 | { | 421 | { |
422 | GNUNET_array_append (lsocks, ls, | 422 | GNUNET_array_append (lsocks, ls, |
423 | GNUNET_NETWORK_get_fd (sli->listen_socket)); | 423 | GNUNET_NETWORK_get_fd (sli->listen_socket)); |
424 | if (sli->accept_task != GNUNET_SCHEDULER_NO_TASK) | 424 | if (sli->accept_task != NULL) |
425 | { | 425 | { |
426 | GNUNET_SCHEDULER_cancel (sli->accept_task); | 426 | GNUNET_SCHEDULER_cancel (sli->accept_task); |
427 | sli->accept_task = GNUNET_SCHEDULER_NO_TASK; | 427 | sli->accept_task = NULL; |
428 | } | 428 | } |
429 | } | 429 | } |
430 | #if WINDOWS | 430 | #if WINDOWS |
@@ -586,7 +586,7 @@ accept_connection (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
586 | struct ServiceListeningInfo *sli = cls; | 586 | struct ServiceListeningInfo *sli = cls; |
587 | struct ServiceList *sl = sli->sl; | 587 | struct ServiceList *sl = sli->sl; |
588 | 588 | ||
589 | sli->accept_task = GNUNET_SCHEDULER_NO_TASK; | 589 | sli->accept_task = NULL; |
590 | GNUNET_assert (GNUNET_NO == in_shutdown); | 590 | GNUNET_assert (GNUNET_NO == in_shutdown); |
591 | if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) | 591 | if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) |
592 | return; | 592 | return; |
@@ -971,10 +971,10 @@ do_shutdown () | |||
971 | GNUNET_SERVER_destroy (server); | 971 | GNUNET_SERVER_destroy (server); |
972 | server = NULL; | 972 | server = NULL; |
973 | } | 973 | } |
974 | if (GNUNET_SCHEDULER_NO_TASK != child_death_task) | 974 | if (NULL != child_death_task) |
975 | { | 975 | { |
976 | GNUNET_SCHEDULER_cancel (child_death_task); | 976 | GNUNET_SCHEDULER_cancel (child_death_task); |
977 | child_death_task = GNUNET_SCHEDULER_NO_TASK; | 977 | child_death_task = NULL; |
978 | } | 978 | } |
979 | } | 979 | } |
980 | 980 | ||
@@ -1015,10 +1015,10 @@ shutdown_task (void *cls, | |||
1015 | 1015 | ||
1016 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1016 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1017 | "First shutdown phase\n"); | 1017 | "First shutdown phase\n"); |
1018 | if (GNUNET_SCHEDULER_NO_TASK != child_restart_task) | 1018 | if (NULL != child_restart_task) |
1019 | { | 1019 | { |
1020 | GNUNET_SCHEDULER_cancel (child_restart_task); | 1020 | GNUNET_SCHEDULER_cancel (child_restart_task); |
1021 | child_restart_task = GNUNET_SCHEDULER_NO_TASK; | 1021 | child_restart_task = NULL; |
1022 | } | 1022 | } |
1023 | in_shutdown = GNUNET_YES; | 1023 | in_shutdown = GNUNET_YES; |
1024 | /* first, stop listening */ | 1024 | /* first, stop listening */ |
@@ -1028,10 +1028,10 @@ shutdown_task (void *cls, | |||
1028 | { | 1028 | { |
1029 | GNUNET_CONTAINER_DLL_remove (pos->listen_head, | 1029 | GNUNET_CONTAINER_DLL_remove (pos->listen_head, |
1030 | pos->listen_tail, sli); | 1030 | pos->listen_tail, sli); |
1031 | if (sli->accept_task != GNUNET_SCHEDULER_NO_TASK) | 1031 | if (sli->accept_task != NULL) |
1032 | { | 1032 | { |
1033 | GNUNET_SCHEDULER_cancel (sli->accept_task); | 1033 | GNUNET_SCHEDULER_cancel (sli->accept_task); |
1034 | sli->accept_task = GNUNET_SCHEDULER_NO_TASK; | 1034 | sli->accept_task = NULL; |
1035 | } | 1035 | } |
1036 | GNUNET_break (GNUNET_OK == | 1036 | GNUNET_break (GNUNET_OK == |
1037 | GNUNET_NETWORK_socket_close (sli->listen_socket)); | 1037 | GNUNET_NETWORK_socket_close (sli->listen_socket)); |
@@ -1082,7 +1082,7 @@ delayed_restart_task (void *cls, | |||
1082 | struct GNUNET_TIME_Relative lowestRestartDelay; | 1082 | struct GNUNET_TIME_Relative lowestRestartDelay; |
1083 | struct ServiceListeningInfo *sli; | 1083 | struct ServiceListeningInfo *sli; |
1084 | 1084 | ||
1085 | child_restart_task = GNUNET_SCHEDULER_NO_TASK; | 1085 | child_restart_task = NULL; |
1086 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) | 1086 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) |
1087 | return; | 1087 | return; |
1088 | GNUNET_assert (GNUNET_NO == in_shutdown); | 1088 | GNUNET_assert (GNUNET_NO == in_shutdown); |
@@ -1110,7 +1110,7 @@ delayed_restart_task (void *cls, | |||
1110 | { | 1110 | { |
1111 | /* process is run on-demand, ensure it is re-started if there is demand */ | 1111 | /* process is run on-demand, ensure it is re-started if there is demand */ |
1112 | for (sli = sl->listen_head; NULL != sli; sli = sli->next) | 1112 | for (sli = sl->listen_head; NULL != sli; sli = sli->next) |
1113 | if (GNUNET_SCHEDULER_NO_TASK == sli->accept_task) | 1113 | if (NULL == sli->accept_task) |
1114 | { | 1114 | { |
1115 | /* accept was actually paused, so start it again */ | 1115 | /* accept was actually paused, so start it again */ |
1116 | sli->accept_task = | 1116 | sli->accept_task = |
@@ -1164,7 +1164,7 @@ maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1164 | const struct GNUNET_DISK_FileHandle *pr; | 1164 | const struct GNUNET_DISK_FileHandle *pr; |
1165 | 1165 | ||
1166 | pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ); | 1166 | pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ); |
1167 | child_death_task = GNUNET_SCHEDULER_NO_TASK; | 1167 | child_death_task = NULL; |
1168 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) | 1168 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) |
1169 | { | 1169 | { |
1170 | /* shutdown scheduled us, ignore! */ | 1170 | /* shutdown scheduled us, ignore! */ |
@@ -1239,7 +1239,7 @@ maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1239 | /* process can still be re-started on-demand, ensure it is re-started if there is demand */ | 1239 | /* process can still be re-started on-demand, ensure it is re-started if there is demand */ |
1240 | for (sli = pos->listen_head; NULL != sli; sli = sli->next) | 1240 | for (sli = pos->listen_head; NULL != sli; sli = sli->next) |
1241 | { | 1241 | { |
1242 | GNUNET_break (GNUNET_SCHEDULER_NO_TASK == sli->accept_task); | 1242 | GNUNET_break (NULL == sli->accept_task); |
1243 | sli->accept_task = | 1243 | sli->accept_task = |
1244 | GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, | 1244 | GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, |
1245 | sli->listen_socket, &accept_connection, sli); | 1245 | sli->listen_socket, &accept_connection, sli); |
@@ -1255,7 +1255,7 @@ maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1255 | /* schedule restart */ | 1255 | /* schedule restart */ |
1256 | pos->restart_at = GNUNET_TIME_relative_to_absolute (pos->backoff); | 1256 | pos->restart_at = GNUNET_TIME_relative_to_absolute (pos->backoff); |
1257 | pos->backoff = GNUNET_TIME_STD_BACKOFF (pos->backoff); | 1257 | pos->backoff = GNUNET_TIME_STD_BACKOFF (pos->backoff); |
1258 | if (GNUNET_SCHEDULER_NO_TASK != child_restart_task) | 1258 | if (NULL != child_restart_task) |
1259 | GNUNET_SCHEDULER_cancel (child_restart_task); | 1259 | GNUNET_SCHEDULER_cancel (child_restart_task); |
1260 | child_restart_task = GNUNET_SCHEDULER_add_with_priority ( | 1260 | child_restart_task = GNUNET_SCHEDULER_add_with_priority ( |
1261 | GNUNET_SCHEDULER_PRIORITY_IDLE, &delayed_restart_task, NULL); | 1261 | GNUNET_SCHEDULER_PRIORITY_IDLE, &delayed_restart_task, NULL); |