X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=contrib%2Ftimeout_watchdog.c;h=a33f67adc007b6eb84335988eaeeb8556865db2e;hb=1cc4422321ddec369d7ff8843ca4fbec8d61e68f;hp=c8c339167f235fddb1f0e20e7ecc723aeba75f3a;hpb=618779d80c15219b8d9504067f286b5ac1b9b194;p=oweals%2Fgnunet.git diff --git a/contrib/timeout_watchdog.c b/contrib/timeout_watchdog.c index c8c339167..a33f67adc 100644 --- a/contrib/timeout_watchdog.c +++ b/contrib/timeout_watchdog.c @@ -4,7 +4,7 @@ GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 2, or (at your + by the Free Software Foundation; either version 3, or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but @@ -24,83 +24,90 @@ * @author Matthias Wachs */ -#include "signal.h" -#include "stdio.h" -#include "stdlib.h" +#include +#include +#include +#include +#include #include -#include -static int child_died; static pid_t child; -void sigchld_handler(int val) +static void +sigchld_handler (int val) { int status = 0; int ret = 0; - - waitpid (child, &status, 0); - if (WIFEXITED(status) == 1) - { - ret = WEXITSTATUS(status); - printf("Test process exited with result %u\n", ret); - } - if (WIFSIGNALED(status) == 1) - { - printf("Test process was signaled %u\n", WTERMSIG(status)); - ret = WTERMSIG(status); - } - exit(ret); -} -void sigint_handler(int val) -{ - kill(0, val); - exit(1); + waitpid (child, &status, 0); + if (WIFEXITED (status) != 0) + { + ret = WEXITSTATUS (status); + printf ("Test process exited with result %u\n", ret); + } + if (WIFSIGNALED (status) != 0) + { + ret = WTERMSIG (status); + printf ("Test process was signaled %u\n", ret); + } + exit (ret); } - -int main(int argc, char *argv[]) +static void +sigint_handler (int val) { -int timeout = 0; -int remain = 0; -int ret = 0; - -if (argc < 3) -{ - printf("arg 1: timeout in sec., arg 2: executable, arg arguments\n"); - exit(1); + kill (0, val); + exit (val); } -timeout = atoi(argv[1]); - -if (timeout == 0) - timeout = 600; - - -char ** arguments = &argv[3]; - -pid_t gpid = getpgid(0); -signal(SIGCHLD, sigchld_handler); -signal(SIGABRT, sigint_handler); -signal(SIGKILL, sigint_handler); -signal(SIGILL, sigint_handler); -signal(SIGSEGV, sigint_handler); -signal(SIGINT, sigint_handler); -signal(SIGTERM, sigint_handler); - -child = fork(); -if (child==0) -{ - setpgid(0,gpid); - execvp(argv[2],&argv[2]); - exit(1); -} -if (child > 0) +int +main (int argc, char *argv[]) { - sleep(timeout); - kill(0,SIGABRT); - exit(1); -} + int timeout = 0; + pid_t gpid = 0; + + if (argc < 3) + { + printf + ("arg 1: timeout in sec., arg 2: executable, arg arguments\n"); + exit (1); + } + + timeout = atoi (argv[1]); + + if (timeout == 0) + timeout = 600; + +/* with getpgid() it does not compile, but getpgrp is the BSD version and working */ + gpid = getpgrp (); + + signal (SIGCHLD, sigchld_handler); + signal (SIGABRT, sigint_handler); + signal (SIGFPE, sigint_handler); + signal (SIGILL, sigint_handler); + signal (SIGINT, sigint_handler); + signal (SIGSEGV, sigint_handler); + signal (SIGTERM, sigint_handler); + + child = fork (); + if (child == 0) + { + /* int setpgrp(pid_t pid, pid_t pgid); is not working on this machine */ + //setpgrp (0, pid_t gpid); + if (-1 != gpid) + setpgid (0, gpid); + execvp (argv[2], &argv[2]); + exit (1); + } + if (child > 0) + { + sleep (timeout); + printf ("Child processes were killed after timeout of %u seconds\n", + timeout); + kill (0, SIGTERM); + exit (1); + } + exit (1); } /* end of timeout_watchdog.c */