[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26379 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r26379 - gnunet/src/testbed |
Date: |
Mon, 11 Mar 2013 15:44:45 +0100 |
Author: harsha
Date: 2013-03-11 15:44:45 +0100 (Mon, 11 Mar 2013)
New Revision: 26379
Modified:
gnunet/src/testbed/gnunet-helper-testbed.c
Log:
- fix crash monitoring
Modified: gnunet/src/testbed/gnunet-helper-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-helper-testbed.c 2013-03-11 13:32:43 UTC (rev
26378)
+++ gnunet/src/testbed/gnunet-helper-testbed.c 2013-03-11 14:44:45 UTC (rev
26379)
@@ -24,8 +24,13 @@
* 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. This binary also kills the testbed service
- * should the connection from the remote controller is dropped
+ * 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.
+ *
* @author Sree Harsha Totakura <address@hidden>
*/
@@ -129,6 +134,11 @@
static GNUNET_SCHEDULER_TaskIdentifier child_death_task_id;
/**
+ * shutdown task id
+ */
+static GNUNET_SCHEDULER_TaskIdentifier shutdown_task_id;
+
+/**
* Are we done reading messages from stdin?
*/
static int done_reading;
@@ -140,13 +150,7 @@
/**
- * Are we shutting down
- */
-static int in_shutdown;
-
-
-/**
- * Task to shutting down nicely
+ * Task to shut down cleanly
*
* @param cls NULL
* @param tc the task context
@@ -154,8 +158,13 @@
static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- LOG_DEBUG ("Shutting down\n");
- in_shutdown = GNUNET_YES;
+ LOG_DEBUG ("Shutting down\n");
+ shutdown_task_id = GNUNET_SCHEDULER_NO_TASK;
+ 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_SCHEDULER_cancel (read_task_id);
@@ -166,6 +175,11 @@
GNUNET_SCHEDULER_cancel (write_task_id);
write_task_id = GNUNET_SCHEDULER_NO_TASK;
}
+ if (GNUNET_SCHEDULER_NO_TASK != child_death_task_id)
+ {
+ GNUNET_SCHEDULER_cancel (child_death_task_id);
+ child_death_task_id = GNUNET_SCHEDULER_NO_TASK;
+ }
if (NULL != stdin_fd)
(void) GNUNET_DISK_file_close (stdin_fd);
if (NULL != stdout_fd)
@@ -174,13 +188,31 @@
tokenizer = NULL;
if (NULL != testbed)
{
- LOG_DEBUG ("Killing testbed\n");
- GNUNET_break (0 == GNUNET_OS_process_kill (testbed, SIGTERM));
+ 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);
+ test_system = NULL;
}
}
/**
+ * Scheduler shutdown task to be run now.
+ */
+static void
+shutdown_now (void)
+{
+ if (GNUNET_SCHEDULER_NO_TASK != 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
@@ -224,6 +256,41 @@
/**
+ * Task triggered whenever we receive a SIGCHLD (child
+ * 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)
+{
+ const struct GNUNET_DISK_FileHandle *pr;
+ char c[16];
+
+ pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ);
+ child_death_task_id = GNUNET_SCHEDULER_NO_TASK;
+ 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 ("Child died\n");
+ if (NULL != testbed)
+ {
+ GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (testbed));
+ GNUNET_OS_process_destroy (testbed);
+ testbed = NULL;
+ }
+ shutdown_now ();
+}
+
+
+/**
* Functions with this signature are called whenever a
* complete message is received by the tokenizer.
*
@@ -363,12 +430,17 @@
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,
+
GNUNET_DISK_PIPE_END_READ),
+ &child_death_task, NULL);
return GNUNET_OK;
error:
status = GNUNET_SYSERR;
- GNUNET_SCHEDULER_shutdown ();
+ shutdown_now ();
return GNUNET_SYSERR;
}
@@ -391,13 +463,15 @@
sread = GNUNET_DISK_file_read (stdin_fd, buf, sizeof (buf));
if ((GNUNET_SYSERR == sread) || (0 == sread))
{
- GNUNET_SCHEDULER_shutdown ();
+ LOG_DEBUG ("STDIN closed\n");
+ shutdown_now ();
return;
}
if (GNUNET_YES == done_reading)
{
/* didn't expect any more data! */
- GNUNET_SCHEDULER_shutdown ();
+ GNUNET_break_op (0);
+ shutdown_now ();
return;
}
LOG_DEBUG ("Read %u bytes\n", sread);
@@ -406,7 +480,7 @@
GNUNET_NO))
{
GNUNET_break (0);
- GNUNET_SCHEDULER_shutdown ();
+ shutdown_now ();
return;
}
read_task_id = /* No timeout while reading */
@@ -416,42 +490,6 @@
/**
- * Task triggered whenever we receive a SIGCHLD (child
- * 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)
-{
- const struct GNUNET_DISK_FileHandle *pr;
- char c[16];
-
- pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ);
- child_death_task_id = GNUNET_SCHEDULER_NO_TASK;
- 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 ("Child died\n");
- GNUNET_assert (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);
- test_system = NULL;
- }
-}
-
-
-/**
* Main function that will be run.
*
* @param cls closure
@@ -470,13 +508,9 @@
read_task_id =
GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, stdin_fd,
&read_task, NULL);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
- NULL);
- child_death_task_id =
- GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_DISK_pipe_handle (sigpipe,
-
GNUNET_DISK_PIPE_END_READ),
- &child_death_task, NULL);
+ shutdown_task_id =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&shutdown_task,
+ NULL);
}
@@ -516,7 +550,6 @@
int ret;
status = GNUNET_OK;
- in_shutdown = GNUNET_NO;
if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO,
GNUNET_NO, GNUNET_NO)))
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26379 - gnunet/src/testbed,
gnunet <=