diff options
| author | Ruslan Bukin <br@FreeBSD.org> | 2016-09-21 11:59:52 +0000 |
|---|---|---|
| committer | Ruslan Bukin <br@FreeBSD.org> | 2016-09-21 11:59:52 +0000 |
| commit | dab6d6fb5a49bd5f67d90138b917d1736ff5cf19 (patch) | |
| tree | 953036e6f3b67be33734e0409383d0b9eb07fb81 | |
| parent | bc3ad3a179d54307b0adec96e64daaecaf657b09 (diff) | |
Notes
| -rw-r--r-- | lib/libutil/tests/pidfile_test.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/lib/libutil/tests/pidfile_test.c b/lib/libutil/tests/pidfile_test.c index 0b70bc80152ba..42a7be4db8490 100644 --- a/lib/libutil/tests/pidfile_test.c +++ b/lib/libutil/tests/pidfile_test.c @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/wait.h> +#include <sys/event.h> #include <fcntl.h> #include <errno.h> @@ -43,8 +44,8 @@ __FBSDID("$FreeBSD$"); #include <libutil.h> /* - * We need a signal handler so kill(2) will interrupt our child's - * select(2) instead of killing it. + * We need a signal handler so kill(2) will interrupt the child + * instead of killing it. */ static void signal_handler(int sig) @@ -129,7 +130,9 @@ common_test_pidfile_child(const char *fn, int parent_open) struct pidfh *pf = NULL; pid_t other = 0, pid = 0; int fd[2], serrno, status; + struct kevent event, ke; char ch; + int kq; unlink(fn); if (pipe(fd) != 0) @@ -166,10 +169,20 @@ common_test_pidfile_child(const char *fn, int parent_open) if (pf == NULL) _exit(1); if (pidfile_write(pf) != 0) - _exit(1); + _exit(2); + kq = kqueue(); + if (kq == -1) + _exit(3); + EV_SET(&ke, SIGINT, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); + /* Attach event to the kqueue. */ + if (kevent(kq, &ke, 1, NULL, 0, NULL) != 0) + _exit(4); + /* Inform the parent we are ready to receive SIGINT */ if (write(fd[1], "*", 1) != 1) - _exit(1); - select(0, 0, 0, 0, 0); + _exit(5); + /* Wait for SIGINT received */ + if (kevent(kq, NULL, 0, &event, 1, NULL) != 1) + _exit(6); _exit(0); } // parent |