aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/gnunet_testbed_mpi_spawn.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testbed/gnunet_testbed_mpi_spawn.c')
-rw-r--r--src/testbed/gnunet_testbed_mpi_spawn.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/testbed/gnunet_testbed_mpi_spawn.c b/src/testbed/gnunet_testbed_mpi_spawn.c
index 41d805471..3fb50cb8f 100644
--- a/src/testbed/gnunet_testbed_mpi_spawn.c
+++ b/src/testbed/gnunet_testbed_mpi_spawn.c
@@ -58,17 +58,17 @@ static enum GNUNET_OS_ProcessStatusType child_status;
58/** 58/**
59 * The shutdown task 59 * The shutdown task
60 */ 60 */
61static GNUNET_SCHEDULER_TaskIdentifier shutdown_task_id; 61static struct GNUNET_SCHEDULER_Task * shutdown_task_id;
62 62
63/** 63/**
64 * Task to kill the child 64 * Task to kill the child
65 */ 65 */
66static GNUNET_SCHEDULER_TaskIdentifier terminate_task_id; 66static struct GNUNET_SCHEDULER_Task * terminate_task_id;
67 67
68/** 68/**
69 * Task to kill the child 69 * Task to kill the child
70 */ 70 */
71static GNUNET_SCHEDULER_TaskIdentifier child_death_task_id; 71static struct GNUNET_SCHEDULER_Task * child_death_task_id;
72 72
73/** 73/**
74 * The shutdown task 74 * The shutdown task
@@ -76,7 +76,7 @@ static GNUNET_SCHEDULER_TaskIdentifier child_death_task_id;
76static void 76static void
77shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 77shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
78{ 78{
79 shutdown_task_id = GNUNET_SCHEDULER_NO_TASK; 79 shutdown_task_id = NULL;
80 if (0 != child_exit_code) 80 if (0 != child_exit_code)
81 { 81 {
82 LOG (GNUNET_ERROR_TYPE_WARNING, "Child exited with error code: %lu\n", 82 LOG (GNUNET_ERROR_TYPE_WARNING, "Child exited with error code: %lu\n",
@@ -140,7 +140,7 @@ child_death_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
140 char c[16]; 140 char c[16];
141 141
142 pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ); 142 pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ);
143 child_death_task_id = GNUNET_SCHEDULER_NO_TASK; 143 child_death_task_id = NULL;
144 if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) 144 if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY))
145 { 145 {
146 child_death_task_id = 146 child_death_task_id =
@@ -152,7 +152,7 @@ child_death_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
152 GNUNET_break (0 < GNUNET_DISK_file_read (pr, &c, sizeof (c))); 152 GNUNET_break (0 < GNUNET_DISK_file_read (pr, &c, sizeof (c)));
153 LOG_DEBUG ("Child died\n"); 153 LOG_DEBUG ("Child died\n");
154 GNUNET_SCHEDULER_cancel (terminate_task_id); 154 GNUNET_SCHEDULER_cancel (terminate_task_id);
155 terminate_task_id = GNUNET_SCHEDULER_NO_TASK; 155 terminate_task_id = NULL;
156 GNUNET_assert (GNUNET_OK == GNUNET_OS_process_status (child, &child_status, 156 GNUNET_assert (GNUNET_OK == GNUNET_OS_process_status (child, &child_status,
157 &child_exit_code)); 157 &child_exit_code));
158 GNUNET_OS_process_destroy (child); 158 GNUNET_OS_process_destroy (child);