[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20399 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20399 - gnunet/src/util |
Date: |
Fri, 9 Mar 2012 12:57:32 +0100 |
Author: grothoff
Date: 2012-03-09 12:57:32 +0100 (Fri, 09 Mar 2012)
New Revision: 20399
Modified:
gnunet/src/util/os_priority.c
gnunet/src/util/test_os_start_process.c
Log:
-additional tests for process starts
Modified: gnunet/src/util/os_priority.c
===================================================================
--- gnunet/src/util/os_priority.c 2012-03-09 11:39:53 UTC (rev 20398)
+++ gnunet/src/util/os_priority.c 2012-03-09 11:57:32 UTC (rev 20399)
@@ -299,7 +299,7 @@
}
if (-1 == fd)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
(flags == GNUNET_DISK_OPEN_READ)
? _("Failed to open named pipe `%s' for reading: %s\n")
: _("Failed to open named pipe `%s' for writing: %s\n"),
Modified: gnunet/src/util/test_os_start_process.c
===================================================================
--- gnunet/src/util/test_os_start_process.c 2012-03-09 11:39:53 UTC (rev
20398)
+++ gnunet/src/util/test_os_start_process.c 2012-03-09 11:57:32 UTC (rev
20399)
@@ -51,12 +51,11 @@
static void
end_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
-
if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
}
- GNUNET_OS_process_wait (proc);
+ GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc));
GNUNET_OS_process_close (proc);
proc = NULL;
GNUNET_DISK_pipe_close (hello_pipe_stdout);
@@ -106,7 +105,7 @@
static void
-task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+run_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
char *fn;
const struct GNUNET_DISK_FileHandle *stdout_read_handle;
@@ -160,22 +159,79 @@
GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
stdout_read_handle, &read_call,
(void *) stdout_read_handle);
-
}
+
/**
* Main method, starts scheduler with task1,
* checks that "ok" is correct at the end.
*/
static int
-check ()
+check_run ()
{
ok = 1;
- GNUNET_SCHEDULER_run (&task, &ok);
+ GNUNET_SCHEDULER_run (&run_task, &ok);
return ok;
}
+/**
+ * Test killing via pipe.
+ */
+static int
+check_kill ()
+{
+ hello_pipe_stdin = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_YES,
GNUNET_NO);
+ hello_pipe_stdout = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO,
GNUNET_YES);
+ if ((hello_pipe_stdout == NULL) || (hello_pipe_stdin == NULL))
+ {
+ return 1;
+ }
+ proc =
+ GNUNET_OS_start_process (GNUNET_YES, hello_pipe_stdin, hello_pipe_stdout,
"cat",
+ "gnunet-service-resolver", "-", NULL);
+ sleep (1); /* give process time to start and open pipe */
+ if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+ }
+ GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc));
+ GNUNET_OS_process_close (proc);
+ proc = NULL;
+ GNUNET_DISK_pipe_close (hello_pipe_stdout);
+ GNUNET_DISK_pipe_close (hello_pipe_stdin);
+ return 0;
+}
+
+
+/**
+ * Test killing via pipe.
+ */
+static int
+check_instant_kill ()
+{
+ hello_pipe_stdin = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_YES,
GNUNET_NO);
+ hello_pipe_stdout = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO,
GNUNET_YES);
+ if ((hello_pipe_stdout == NULL) || (hello_pipe_stdin == NULL))
+ {
+ return 1;
+ }
+ proc =
+ GNUNET_OS_start_process (GNUNET_YES, hello_pipe_stdin, hello_pipe_stdout,
"cat",
+ "gnunet-service-resolver", "-", NULL);
+ if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+ }
+ GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc));
+ GNUNET_OS_process_close (proc);
+ proc = NULL;
+ GNUNET_DISK_pipe_close (hello_pipe_stdout);
+ GNUNET_DISK_pipe_close (hello_pipe_stdin);
+ return 0;
+}
+
+
int
main (int argc, char *argv[])
{
@@ -188,7 +244,10 @@
"WARNING",
#endif
NULL);
- ret = check ();
+ ret = 0;
+ ret |= check_run ();
+ ret |= check_kill ();
+ ret |= check_instant_kill ();
return ret;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20399 - gnunet/src/util,
gnunet <=