A start for testing EVFILT_PROC, not done yet, but this is a good check point.

3 files changed, 145 insertions, 6 deletions

diff --git a/regress/sys/kern/kqueue/Makefile b/regress/sys/kern/kqueue/Makefile
index 4755bc391ca..abc15a06839 100644
--- a/regress/sys/kern/kqueue/Makefile
+++ b/regress/sys/kern/kqueue/Makefile
@@ -1,14 +1,16 @@
-#	$OpenBSD: Makefile,v 1.2 2002/02/27 17:11:51 art Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/03/02 21:48:05 art Exp $
 
 PROG=	kqueue-test
-SRCS= kqueue-pipe.c kqueue-fork.c main.c
+SRCS= kqueue-pipe.c kqueue-fork.c main.c kqueue-process.c
 
 kq-pipe: ${PROG}
 	./${PROG} -p
 kq-fork: ${PROG}
 	./${PROG} -f
+kq-process: ${PROG}
+	./${PROG} -P
 
-REGRESSTARGETS=kq-pipe kq-fork
+REGRESSTARGETS=kq-pipe kq-fork kq-process
 .PHONY: ${REGRESSTARGETS}
 
 .include <bsd.regress.mk>
diff --git a/regress/sys/kern/kqueue/kqueue-process.c b/regress/sys/kern/kqueue/kqueue-process.c
new file mode 100644
index 00000000000..b9112ca1a60
--- /dev/null
+++ b/regress/sys/kern/kqueue/kqueue-process.c
@@ -0,0 +1,133 @@
+/*	$OpenBSD: kqueue-process.c,v 1.1 2002/03/02 21:48:05 art Exp $	*/
+/*
+ *	Written by Artur Grabowski <art@openbsd.org> 2002 Public Domain
+ */
+
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/wait.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <err.h>
+#include <unistd.h>
+#include <signal.h>
+
+static int process_child(void);
+
+#define ASS(cond, mess) do { if (!(cond)) { mess; return 1; } } while (0)
+
+#define ASSX(cond) ASS(cond, warnx("assertion " #cond " failed on line %d", __LINE__))
+
+void
+usr1handler(int signum)
+{
+	/* nada */
+}
+
+int
+do_process(void)
+{
+	struct kevent ke;
+	int kq, status;
+	pid_t pid, pid2;
+	int didfork, didchild;
+	int i;
+	struct timespec ts;
+
+	/*
+	 * Timeout in case something doesn't work.
+	 */
+	ts.tv_sec = 10;
+	ts.tv_nsec = 0;
+
+	ASS((kq = kqueue()) >= 0, warn("kqueue"));
+
+	/*
+	 * Install a signal handler so that we can use pause() to synchronize
+	 * with the child with the parent.
+	 */
+	signal(SIGUSR1, usr1handler);
+
+	switch ((pid = fork())) {
+	case -1:
+		err(1, "fork");
+	case 0:
+		_exit(process_child());
+	}
+
+	sleep(2);	/* wait for child to settle down. */
+
+	EV_SET(&ke, pid, EVFILT_PROC, EV_ADD|EV_ENABLE|EV_CLEAR,
+	    NOTE_EXIT|NOTE_FORK|NOTE_EXEC|NOTE_TRACK, 0, NULL);
+	ASS(kevent(kq, &ke, 1, NULL, 0, NULL) == 0,
+	    warn("can't register events on kqueue"));
+
+	kill(pid, SIGUSR1);	/* sync 1 */
+
+	didfork = didchild = 0;
+
+	for (i = 0; i < 2; i++) {
+		ASS(kevent(kq, NULL, 0, &ke, 1, &ts) == 1,
+		    warnx("didn't receive event"));
+		ASSX(ke.filter == EVFILT_PROC);
+		switch (ke.fflags) {
+		case NOTE_CHILD:
+			didchild = 1;
+			ASSX((pid_t)ke.data == pid);
+			pid2 = ke.ident;
+			fprintf(stderr, "child %d\n", pid2);
+			break;
+		case NOTE_FORK:
+			didfork = 1;
+			ASSX(ke.ident == pid);
+			fprintf(stderr, "fork\n");
+			break;
+		case NOTE_TRACKERR:
+			errx(1, "child tracking failed due to resource shortage");
+		default:
+			errx(1, "kevent returned weird event 0x%x pid %d\n",
+			    ke.fflags, (pid_t)ke.ident);
+		}
+	}
+
+	/* Both children now sleeping. */
+
+	ASSX(didchild == didfork == 1);
+	
+	kill(pid2, SIGUSR1);	/* sync 2.1 */
+	kill(pid, SIGUSR1);	/* sync 2 */
+
+	if (wait(&status) < 0)
+		err(1, "wait");
+
+	if (!WIFEXITED(status))
+		errx(1, "child didn't exit?");
+
+	close(kq);
+	return (WEXITSTATUS(status) != 0);
+}
+
+static int
+process_child(void)
+{
+	signal(SIGCHLD, SIG_IGN);	/* ignore our children. */
+
+	pause();
+
+	/* fork and see if tracking works. */
+	switch (fork()) {
+	case -1:
+		err(1, "fork");
+	case 0:
+		/* sync 2.1 */
+		pause();
+		execl("/usr/bin/true", "true", NULL);
+		err(1, "execl(true)");
+	}
+
+	/* sync 2 */
+	pause();
+
+	return 0;
+}
diff --git a/regress/sys/kern/kqueue/main.c b/regress/sys/kern/kqueue/main.c
index e6155bf4875..5b9c389b49e 100644
--- a/regress/sys/kern/kqueue/main.c
+++ b/regress/sys/kern/kqueue/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.1 2002/02/27 17:11:51 art Exp $	*/
+/*	$OpenBSD: main.c,v 1.2 2002/03/02 21:48:05 art Exp $	*/
 /*
  *	Written by Artur Grabowski <art@openbsd.org> 2002 Public Domain
  */
@@ -9,6 +9,7 @@
 
 extern int do_pipe(void);
 extern int check_inheritance(void);
+extern int do_process(void);
 
 int
 main(int argc, char **argv)
@@ -16,7 +17,7 @@ main(int argc, char **argv)
 	int ret, c;
 
 	ret = 0;
-	while ((c = getopt(argc, argv, "pf")) != -1) {
+	while ((c = getopt(argc, argv, "pfP")) != -1) {
 		switch (c) {
 		case 'p':
 			ret |= do_pipe();
@@ -24,8 +25,11 @@ main(int argc, char **argv)
 		case 'f':
 			ret |= check_inheritance();
 			break;
+		case 'P':
+			ret |= do_process();
+			break;
 		default:
-			fprintf(stderr, "Usage: kqtest -P|p\n");
+			fprintf(stderr, "Usage: kqtest -P|p|f\n");
 			exit(1);
 		}
 	}