static struct GNUNET_OS_Process *child;
/**
- * The arguments including the binary to spawn
+ * The arguments including the binary to spawn
*/
static char **argv2;
-/**
- * All our IP addresses
- */
-static char **our_addrs;
-
/**
* Pipe used to communicate shutdown via signal.
*/
*/
static enum GNUNET_OS_ProcessStatusType child_status;
-/**
- * how many IP addresses are currently assigned to us
- */
-static unsigned int num_addrs;
-
/**
* The shutdown task
*/
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 int hard_kill;
GNUNET_assert (NULL != child);
- terminate_task_id =
+ terminate_task_id =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&terminate_task, NULL);
if (0 != 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"));
}
{
struct GNUNET_TESTBED_Host **hosts;
const struct GNUNET_CONFIGURATION_Handle *null_cfg;
- const char *host_ip;
char *tmpdir;
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);
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;