Changeset 134ac5d in mainline for uspace/lib/pcut/src/os/unix.c

Timestamp:

2014-06-06T07:54:24Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8db09e4

Parents:

eeb23f2d

Message:

Update PCUT to newest version

File:

• uspace/lib/pcut/src/os/unix.c (modified) (8 diffs)

uspace/lib/pcut/src/os/unix.c

@@ -32 +32 @@
  */
 
+/** We need _POSX_SOURCE because of kill(). */
+#define _POSIX_SOURCE
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
+#include <signal.h>
 #include <errno.h>
 #include <assert.h>
@@ -51 +54 @@
 static char extra_output_buffer[OUTPUT_BUFFER_SIZE];
 
-/** Prepare for a new test. */
+/** Prepare for a new test.
+ *
+ * @param test Test that is about to be run.
+ */
 static void before_test_start(pcut_item_t *test) {
         pcut_report_test_start(test);
@@ -57 +63 @@
         memset(error_message_buffer, 0, OUTPUT_BUFFER_SIZE);
         memset(extra_output_buffer, 0, OUTPUT_BUFFER_SIZE);
+}
+
+/** PID of the forked process running the actual test. */
+static pid_t child_pid;
+
+/** Signal handler that kills the child.
+ *
+ * @param sig Signal number.
+ */
+static void kill_child_on_alarm(int sig) {
+        PCUT_UNUSED(sig);
+        kill(child_pid, SIGKILL);
 }
 
@@ -124 +142 @@
 
         int link_stdout[2], link_stderr[2];
-        pid_t pid;
 
         int rc = pipe(link_stdout);
@@ -141 +158 @@
         }
 
-        pid = fork();
-        if (pid == (pid_t)-1) {
+        child_pid = fork();
+        if (child_pid == (pid_t)-1) {
                 snprintf(error_message_buffer, OUTPUT_BUFFER_SIZE - 1,
                         "fork() failed: %s.", strerror(rc));
@@ -149 +166 @@
         }
 
-        if (pid == 0) {
+        if (child_pid == 0) {
                 /* We are the child. */
                 dup2(link_stdout[1], STDOUT_FILENO);
@@ -164 +181 @@
         close(link_stderr[1]);
 
+        signal(SIGALRM, kill_child_on_alarm);
+        alarm(pcut_get_test_timeout(test));
+
         size_t stderr_size = read_all(link_stderr[0], extra_output_buffer, OUTPUT_BUFFER_SIZE - 1);
         read_all(link_stdout[0], extra_output_buffer, OUTPUT_BUFFER_SIZE - 1 - stderr_size);
@@ -169 +189 @@
         int status;
         wait(&status);
+        alarm(0);
 
         rc = convert_wait_status_to_outcome(status);