/**
* The shutdown task
*/
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_task_id;
+static struct GNUNET_SCHEDULER_Task * shutdown_task_id;
/**
* Task to kill the child
*/
-static GNUNET_SCHEDULER_TaskIdentifier terminate_task_id;
+static struct GNUNET_SCHEDULER_Task * terminate_task_id;
/**
* Task to kill the child
*/
-static GNUNET_SCHEDULER_TaskIdentifier child_death_task_id;
+static struct GNUNET_SCHEDULER_Task * child_death_task_id;
/**
* The shutdown task
*/
static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
- shutdown_task_id = GNUNET_SCHEDULER_NO_TASK;
+ shutdown_task_id = NULL;
if (0 != child_exit_code)
{
LOG (GNUNET_ERROR_TYPE_WARNING, "Child exited with error code: %lu\n",
static void
-terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+terminate_task (void *cls)
{
static int hard_kill;
}
}
hard_kill++;
- GNUNET_break (0 == GNUNET_OS_process_kill (child, SIGTERM));
+ GNUNET_break (0 == GNUNET_OS_process_kill (child, GNUNET_TERM_SIG));
LOG (GNUNET_ERROR_TYPE_INFO, _("Waiting for child to exit.\n"));
}
* process died).
*
* @param cls closure, NULL if we need to self-restart
- * @param tc context
*/
static void
-child_death_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+child_death_task (void *cls)
{
const struct GNUNET_DISK_FileHandle *pr;
char c[16];
+ const struct GNUNET_SCHEDULER_TaskContext *tc;
+
pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ);
- child_death_task_id = GNUNET_SCHEDULER_NO_TASK;
+ child_death_task_id = NULL;
+ tc = GNUNET_SCHEDULER_get_task_context ();
if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY))
{
child_death_task_id =
GNUNET_break (0 < GNUNET_DISK_file_read (pr, &c, sizeof (c)));
LOG_DEBUG ("Child died\n");
GNUNET_SCHEDULER_cancel (terminate_task_id);
- terminate_task_id = GNUNET_SCHEDULER_NO_TASK;
+ terminate_task_id = NULL;
GNUNET_assert (GNUNET_OK == GNUNET_OS_process_status (child, &child_status,
&child_exit_code));
GNUNET_OS_process_destroy (child);
* The main scheduler run task
*
* @param cls NULL
- * @param tc scheduler task context
*/
static void
-run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+run (void *cls)
{
struct GNUNET_TESTBED_Host **hosts;
const struct GNUNET_CONFIGURATION_Handle *null_cfg;
/* Spawn the new process here */
LOG (GNUNET_ERROR_TYPE_INFO, _("Spawning process `%s'\n"), argv2[0]);
child = GNUNET_OS_start_process_vap (GNUNET_NO, GNUNET_OS_INHERIT_STD_ALL, NULL,
- NULL,
+ NULL, NULL,
argv2[0], argv2);
if (NULL == child)
{