diff options
Diffstat (limited to 'src/testbed/gnunet_testbed_mpi_spawn.c')
-rw-r--r-- | src/testbed/gnunet_testbed_mpi_spawn.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/testbed/gnunet_testbed_mpi_spawn.c b/src/testbed/gnunet_testbed_mpi_spawn.c index 3fb50cb8f..191f658b7 100644 --- a/src/testbed/gnunet_testbed_mpi_spawn.c +++ b/src/testbed/gnunet_testbed_mpi_spawn.c | |||
@@ -74,7 +74,7 @@ static struct GNUNET_SCHEDULER_Task * child_death_task_id; | |||
74 | * The shutdown task | 74 | * The shutdown task |
75 | */ | 75 | */ |
76 | static void | 76 | static void |
77 | shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 77 | shutdown_task (void *cls) |
78 | { | 78 | { |
79 | shutdown_task_id = NULL; | 79 | shutdown_task_id = NULL; |
80 | if (0 != child_exit_code) | 80 | if (0 != child_exit_code) |
@@ -96,7 +96,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
96 | 96 | ||
97 | 97 | ||
98 | static void | 98 | static void |
99 | terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 99 | terminate_task (void *cls) |
100 | { | 100 | { |
101 | static int hard_kill; | 101 | static int hard_kill; |
102 | 102 | ||
@@ -131,16 +131,18 @@ terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
131 | * process died). | 131 | * process died). |
132 | * | 132 | * |
133 | * @param cls closure, NULL if we need to self-restart | 133 | * @param cls closure, NULL if we need to self-restart |
134 | * @param tc context | ||
135 | */ | 134 | */ |
136 | static void | 135 | static void |
137 | child_death_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 136 | child_death_task (void *cls) |
138 | { | 137 | { |
139 | const struct GNUNET_DISK_FileHandle *pr; | 138 | const struct GNUNET_DISK_FileHandle *pr; |
140 | char c[16]; | 139 | char c[16]; |
140 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
141 | |||
141 | 142 | ||
142 | pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ); | 143 | pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ); |
143 | child_death_task_id = NULL; | 144 | child_death_task_id = NULL; |
145 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
144 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) | 146 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) |
145 | { | 147 | { |
146 | child_death_task_id = | 148 | child_death_task_id = |
@@ -179,10 +181,9 @@ destroy_hosts(struct GNUNET_TESTBED_Host **hosts, unsigned int nhosts) | |||
179 | * The main scheduler run task | 181 | * The main scheduler run task |
180 | * | 182 | * |
181 | * @param cls NULL | 183 | * @param cls NULL |
182 | * @param tc scheduler task context | ||
183 | */ | 184 | */ |
184 | static void | 185 | static void |
185 | run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 186 | run (void *cls) |
186 | { | 187 | { |
187 | struct GNUNET_TESTBED_Host **hosts; | 188 | struct GNUNET_TESTBED_Host **hosts; |
188 | const struct GNUNET_CONFIGURATION_Handle *null_cfg; | 189 | const struct GNUNET_CONFIGURATION_Handle *null_cfg; |