/*
This file is part of GNUnet
- (C) 2008--2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2008--2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
* gnunet-service-testbed. This binary also receives configuration
* from the remove controller which is put in a temporary location
* with ports and paths fixed so that gnunet-service-testbed runs
- * without any hurdles.
- *
+ * without any hurdles.
+ *
* This helper monitors for three termination events. They are: (1)The
* stdin of the helper is closed for reading; (2)the helper received
* SIGTERM/SIGINT; (3)the testbed crashed. In case of events 1 and 2
- * the helper kills the testbed service.
+ * the helper kills the testbed service. When testbed crashed (event
+ * 3), the helper should send a SIGTERM to its own process group; this
+ * behaviour will help terminate any child processes (peers) testbed
+ * has started and prevents them from leaking and running forever.
*
* @author Sree Harsha Totakura <sreeharsha@totakura.in>
*/
/**
* Task identifier for the read task
*/
-static GNUNET_SCHEDULER_TaskIdentifier read_task_id;
+static struct GNUNET_SCHEDULER_Task * read_task_id;
/**
* Task identifier for the write task
*/
-static GNUNET_SCHEDULER_TaskIdentifier write_task_id;
+static struct GNUNET_SCHEDULER_Task * write_task_id;
/**
* Task to kill the child
*/
-static GNUNET_SCHEDULER_TaskIdentifier child_death_task_id;
+static struct GNUNET_SCHEDULER_Task * child_death_task_id;
/**
* shutdown task id
*/
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_task_id;
+static struct GNUNET_SCHEDULER_Task * shutdown_task_id;
/**
* Are we done reading messages from stdin?
static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- LOG_DEBUG ("Shutting down\n");
- shutdown_task_id = GNUNET_SCHEDULER_NO_TASK;
+ LOG_DEBUG ("Shutting down\n");
+ shutdown_task_id = NULL;
if (NULL != testbed)
{
LOG_DEBUG ("Killing testbed\n");
- GNUNET_break (0 == GNUNET_OS_process_kill (testbed, SIGTERM));
- }
- if (GNUNET_SCHEDULER_NO_TASK != read_task_id)
+ GNUNET_break (0 == GNUNET_OS_process_kill (testbed, GNUNET_TERM_SIG));
+ }
+ if (NULL != read_task_id)
{
GNUNET_SCHEDULER_cancel (read_task_id);
- read_task_id = GNUNET_SCHEDULER_NO_TASK;
+ read_task_id = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != write_task_id)
+ if (NULL != write_task_id)
{
GNUNET_SCHEDULER_cancel (write_task_id);
- write_task_id = GNUNET_SCHEDULER_NO_TASK;
+ write_task_id = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != child_death_task_id)
+ if (NULL != child_death_task_id)
{
GNUNET_SCHEDULER_cancel (child_death_task_id);
- child_death_task_id = GNUNET_SCHEDULER_NO_TASK;
+ child_death_task_id = NULL;
}
if (NULL != stdin_fd)
(void) GNUNET_DISK_file_close (stdin_fd);
GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (testbed));
GNUNET_OS_process_destroy (testbed);
testbed = NULL;
- }
+ }
if (NULL != test_system)
{
GNUNET_TESTING_system_destroy (test_system, GNUNET_YES);
static void
shutdown_now (void)
{
- if (GNUNET_SCHEDULER_NO_TASK != shutdown_task_id)
+ if (NULL != shutdown_task_id)
GNUNET_SCHEDULER_cancel (shutdown_task_id);
shutdown_task_id = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
}
ssize_t bytes_wrote;
GNUNET_assert (NULL != wc);
- write_task_id = GNUNET_SCHEDULER_NO_TASK;
+ write_task_id = NULL;
if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
{
GNUNET_free (wc->data);
int ret;
pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ);
- child_death_task_id = GNUNET_SCHEDULER_NO_TASK;
+ child_death_task_id = NULL;
if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY))
{
child_death_task_id =
GNUNET_break (0);
return;
}
- GNUNET_break (GNUNET_SYSERR !=
+ GNUNET_break (GNUNET_SYSERR !=
(ret = GNUNET_OS_process_status (testbed, &type, &code)));
if (GNUNET_NO != ret)
{
GNUNET_OS_process_destroy (testbed);
testbed = NULL;
- shutdown_now ();
+ /* Send SIGTERM to our process group */
+ 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 */
+ }
return;
}
LOG_DEBUG ("Child hasn't died. Resuming to monitor its status\n");
char *hostname;
char *config;
char *xconfig;
+ char *evstr;
+ //char *str;
size_t config_size;
uLongf ul_config_size;
size_t xconfig_size;
hostname_size);
hostname[hostname_size] = '\0';
}
+ /* unset GNUNET_TESTING_PREFIX if present as it is more relevant for testbed */
+ evstr = getenv (GNUNET_TESTING_PREFIX);
+ if (NULL != evstr)
+ {
+ /* unsetting the variable will invalidate the pointer! */
+ evstr = GNUNET_strdup (evstr);
+#ifdef WINDOWS
+ GNUNET_break (0 != SetEnvironmentVariable (GNUNET_TESTING_PREFIX, NULL));
+#else
+ GNUNET_break (0 == unsetenv (GNUNET_TESTING_PREFIX));
+#endif
+ }
test_system =
- GNUNET_TESTING_system_create ("testbed-helper", trusted_ip, hostname);
+ GNUNET_TESTING_system_create ("testbed-helper", trusted_ip, hostname,
+ NULL);
+ if (NULL != evstr)
+ {
+#ifdef WINDOWS
+ GNUNET_assert (0 != SetEnvironmentVariable (GNUNET_TESTING_PREFIX, evstr));
+#else
+ static char evar[2* PATH_MAX];
+
+ GNUNET_assert (0 < GNUNET_snprintf (evar, sizeof (evar),
+ GNUNET_TESTING_PREFIX "=%s", evstr));
+ putenv (evar);
+#endif
+ GNUNET_free (evstr);
+ evstr = NULL;
+ }
GNUNET_free_non_null (hostname);
hostname = NULL;
GNUNET_assert (NULL != test_system);
GNUNET_assert (GNUNET_OK ==
GNUNET_TESTING_configuration_create (test_system, cfg));
GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "PATHS",
+ GNUNET_CONFIGURATION_get_value_filename (cfg, "PATHS",
"DEFAULTCONFIG",
&config));
if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg, config))
}
LOG_DEBUG ("Staring testbed with config: %s\n", config);
binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-testbed");
+ {
+ static char evar[2 * PATH_MAX];
+
+ /* expose testbed configuration through env variable */
+ GNUNET_assert (0 < GNUNET_snprintf (evar, sizeof (evar),
+ "%s=%s", ENV_TESTBED_CONFIG, config));
+ GNUNET_assert (0 == putenv (evar));
+ evstr = NULL;
+ }
testbed =
GNUNET_OS_start_process (PIPE_CONTROL,
- GNUNET_OS_INHERIT_STD_ERR /*verbose? */ , NULL,
- NULL, binary, "gnunet-service-testbed", "-c",
+ GNUNET_OS_INHERIT_STD_ERR /*verbose? */ ,
+ NULL, NULL, NULL,
+ binary, "gnunet-service-testbed", "-c",
config, NULL);
GNUNET_free (binary);
GNUNET_free (config);
xconfig_size =
GNUNET_TESTBED_compress_config_ (config, config_size, &xconfig);
GNUNET_free (config);
- wc = GNUNET_malloc (sizeof (struct WriteContext));
+ wc = GNUNET_new (struct WriteContext);
wc->length = xconfig_size + sizeof (struct GNUNET_TESTBED_HelperReply);
reply = GNUNET_realloc (xconfig, wc->length);
memmove (&reply[1], reply, xconfig_size);
wc->data = reply;
write_task_id =
GNUNET_SCHEDULER_add_write_file (GNUNET_TIME_UNIT_FOREVER_REL, stdout_fd,
- &write_task, wc);
+ &write_task, wc);
child_death_task_id =
GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
GNUNET_DISK_pipe_handle (sigpipe,
char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE];
ssize_t sread;
- read_task_id = GNUNET_SCHEDULER_NO_TASK;
+ read_task_id = NULL;
if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
return;
sread = GNUNET_DISK_file_read (stdin_fd, buf, sizeof (buf));
read_task_id =
GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, stdin_fd,
&read_task, NULL);
- shutdown_task_id =
+ shutdown_task_id =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
NULL);
}
int ret;
status = GNUNET_OK;
- 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);
- ret = GNUNET_SYSERR;
return 1;
}
shc_chld =
projects / oweals / gnunet.git / blobdiff