/*
This file is part of GNUnet
- Copyright (C) 2008--2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2008--2013 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
/**
* Task identifier for the read task
*/
-static struct GNUNET_SCHEDULER_Task * read_task_id;
+static struct GNUNET_SCHEDULER_Task *read_task_id;
/**
* Task identifier for the write task
*/
-static struct GNUNET_SCHEDULER_Task * write_task_id;
+static struct GNUNET_SCHEDULER_Task *write_task_id;
/**
* Task to kill the child
*/
static struct GNUNET_SCHEDULER_Task * child_death_task_id;
-/**
- * shutdown task id
- */
-static struct GNUNET_SCHEDULER_Task * shutdown_task_id;
-
/**
* Are we done reading messages from stdin?
*/
* Task to shut down cleanly
*
* @param cls NULL
- * @param tc the task context
*/
static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
LOG_DEBUG ("Shutting down\n");
- shutdown_task_id = NULL;
if (NULL != testbed)
{
LOG_DEBUG ("Killing testbed\n");
}
if (NULL != write_task_id)
{
- GNUNET_SCHEDULER_cancel (write_task_id);
+ struct WriteContext *wc;
+
+ wc = GNUNET_SCHEDULER_cancel (write_task_id);
write_task_id = NULL;
+ GNUNET_free (wc->data);
+ GNUNET_free (wc);
}
if (NULL != child_death_task_id)
{
}
-/**
- * Scheduler shutdown task to be run now.
- */
-static void
-shutdown_now (void)
-{
- if (NULL != shutdown_task_id)
- GNUNET_SCHEDULER_cancel (shutdown_task_id);
- shutdown_task_id = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
-}
-
-
/**
* Task to write to the standard out
*
* @param cls the WriteContext
- * @param tc the TaskContext
*/
static void
-write_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+write_task (void *cls)
{
struct WriteContext *wc = cls;
ssize_t bytes_wrote;
GNUNET_assert (NULL != wc);
write_task_id = NULL;
- if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
- {
- GNUNET_free (wc->data);
- GNUNET_free (wc);
- return;
- }
bytes_wrote =
GNUNET_DISK_file_write (stdout_fd, wc->data + wc->pos,
wc->length - wc->pos);
if (GNUNET_SYSERR == bytes_wrote)
{
- LOG (GNUNET_ERROR_TYPE_WARNING, "Cannot reply back configuration\n");
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Cannot reply back configuration\n");
GNUNET_free (wc->data);
GNUNET_free (wc);
return;
return;
}
write_task_id =
- GNUNET_SCHEDULER_add_write_file (GNUNET_TIME_UNIT_FOREVER_REL, stdout_fd,
+ GNUNET_SCHEDULER_add_write_file (GNUNET_TIME_UNIT_FOREVER_REL,
+ stdout_fd,
&write_task, wc);
}
* 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];
pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ);
child_death_task_id = NULL;
- if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY))
- {
- child_death_task_id =
- GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
- pr, &child_death_task, NULL);
- return;
- }
/* consume the signal */
GNUNET_break (0 < GNUNET_DISK_file_read (pr, &c, sizeof (c)));
LOG_DEBUG ("Got SIGCHLD\n");
if (0 != PLIBC_KILL (0, GNUNET_TERM_SIG))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "signal");
- shutdown_now (); /* Couldn't send the signal, we shutdown frowning */
+ GNUNET_SCHEDULER_shutdown (); /* Couldn't send the signal, we shutdown frowning */
}
return;
}
GNUNET_asprintf (&evar,
"%s=%s",
ENV_TESTBED_CONFIG,
- config));
+ config);
GNUNET_assert (0 == putenv (evar)); /* consumes 'evar',
see putenv(): becomes part of envrionment! */
evstr = NULL;
reply->config_size = htons ((uint16_t) config_size);
wc->data = reply;
write_task_id =
- GNUNET_SCHEDULER_add_write_file (GNUNET_TIME_UNIT_FOREVER_REL, stdout_fd,
+ GNUNET_SCHEDULER_add_write_file (GNUNET_TIME_UNIT_FOREVER_REL,
+ stdout_fd,
&write_task, wc);
child_death_task_id =
GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
error:
status = GNUNET_SYSERR;
- shutdown_now ();
+ GNUNET_SCHEDULER_shutdown ();
return GNUNET_SYSERR;
}
* Task to read from stdin
*
* @param cls NULL
- * @param tc the task context
*/
static void
-read_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+read_task (void *cls)
{
char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE];
ssize_t sread;
read_task_id = NULL;
- if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
- return;
sread = GNUNET_DISK_file_read (stdin_fd, buf, sizeof (buf));
if ((GNUNET_SYSERR == sread) || (0 == sread))
{
LOG_DEBUG ("STDIN closed\n");
- shutdown_now ();
+ GNUNET_SCHEDULER_shutdown ();
return;
}
if (GNUNET_YES == done_reading)
{
/* didn't expect any more data! */
GNUNET_break_op (0);
- shutdown_now ();
+ GNUNET_SCHEDULER_shutdown ();
return;
}
- LOG_DEBUG ("Read %u bytes\n", sread);
+ LOG_DEBUG ("Read %u bytes\n",
+ (unsigned int) sread);
if (GNUNET_OK !=
GNUNET_SERVER_mst_receive (tokenizer, NULL, buf, sread, GNUNET_NO,
GNUNET_NO))
{
GNUNET_break (0);
- shutdown_now ();
+ GNUNET_SCHEDULER_shutdown ();
return;
}
read_task_id = /* No timeout while reading */
- GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, stdin_fd,
+ GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
+ stdin_fd,
&read_task, NULL);
}
* @param cfg configuration
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
LOG_DEBUG ("Starting testbed helper...\n");
stdin_fd = GNUNET_DISK_get_handle_from_native (stdin);
stdout_fd = GNUNET_DISK_get_handle_from_native (stdout);
read_task_id =
- GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, stdin_fd,
+ GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
+ stdin_fd,
&read_task, NULL);
- shutdown_task_id =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
- NULL);
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+ NULL);
}
projects / oweals / gnunet.git / blobdiff