static struct GNUNET_OS_Process *child;
/**
- * The arguments including the binary to spawn
+ * The arguments including the binary to spawn
*/
static char **argv2;
*/
static enum GNUNET_OS_ProcessStatusType child_status;
-/**
- * how many IP addresses are currently assigned to us
- */
-static unsigned int num_addrs;
-
-/**
- * The shutdown task
- */
-static GNUNET_SCHEDULER_TaskIdentifier 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;
if (0 != child_exit_code)
{
- LOG (GNUNET_ERROR_TYPE_WARNING, "Child exited with error code: %lu\n",
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Child exited with error code: %lu\n",
child_exit_code);
ret = 128 + (int) child_exit_code;
}
static void
-terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+terminate_task (void *cls)
{
static int hard_kill;
GNUNET_assert (NULL != child);
- terminate_task_id =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &terminate_task, NULL);
+ terminate_task_id =
+ GNUNET_SCHEDULER_add_shutdown (&terminate_task, NULL);
if (0 != hard_kill)
{
switch (hard_kill)
{
case 1:
case 2:
- LOG (GNUNET_ERROR_TYPE_WARNING,
+ LOG (GNUNET_ERROR_TYPE_WARNING,
"%d more interrupts needed to send SIGKILL to the child\n",
3 - hard_kill);
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);
child = NULL;
- shutdown_task_id = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
}
* 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;
char *hostname;
size_t hostname_len;
unsigned int nhosts;
-
- if (0 == num_addrs)
- {
- GNUNET_break (0);
- ret = GNUNET_SYSERR;
- return;
- }
+
null_cfg = GNUNET_CONFIGURATION_create ();
nhosts = GNUNET_TESTBED_hosts_load_from_loadleveler (null_cfg, &hosts);
if (0 == nhosts)
}
if (NULL == strstr (GNUNET_TESTBED_host_get_hostname (hosts[0]), hostname))
{
- LOG_DEBUG ("Exiting as we are not the lowest host\n");
+ LOG_DEBUG ("Exiting as `%s' is not the lowest host\n", hostname);
GNUNET_free (hostname);
ret = GNUNET_OK;
return;
}
+ LOG_DEBUG ("Will be executing `%s' on host `%s'\n", argv2[0], hostname);
GNUNET_free (hostname);
destroy_hosts (hosts, nhosts);
tmpdir = getenv ("TMPDIR");
if (NULL == tmpdir)
tmpdir = getenv ("TMP");
if (NULL == tmpdir)
- tmpdir = getenv ("TEMP");
+ tmpdir = getenv ("TEMP");
if (NULL == tmpdir)
tmpdir = "/tmp";
(void) GNUNET_asprintf (&fn, "%s/gnunet-testbed-spawn.lock", tmpdir);
/* 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)
{
GNUNET_break (0);
ret = GNUNET_SYSERR;
- shutdown_task_id = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
return;
}
ret = GNUNET_OK;
terminate_task_id =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &terminate_task, NULL);
+ GNUNET_SCHEDULER_add_shutdown (&terminate_task, NULL);
child_death_task_id =
GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
GNUNET_DISK_pipe_handle (sigpipe,
GNUNET_break (0);
return 1;
}
- if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO,
+ if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO,
GNUNET_NO, GNUNET_NO)))
{
GNUNET_break (0);
argv2 = GNUNET_malloc (sizeof (char *) * argc);
for (cnt = 1; cnt < argc; cnt++)
argv2[cnt - 1] = argv[cnt];
- GNUNET_SCHEDULER_run (run, NULL);
+ GNUNET_SCHEDULER_run (run, NULL);
GNUNET_free (argv2);
GNUNET_SIGNAL_handler_uninstall (shc_chld);
shc_chld = NULL;
projects / oweals / gnunet.git / blobdiff