PERFORCE change 174235 for review

[Robert Watson]

http://p4web.freebsd.org/chv.cgi?CH=174235

Change 174235 by rwatson at rwatson_vimage_client on 2010/02/03 13:53:55

	Improve debugging output.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/tools/tools/syscall_timing/syscall_timing.c#10 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/tools/tools/syscall_timing/syscall_timing.c#10 (text+ko) ====

@@ -430,9 +430,9 @@
 	pollfd.revents = 0;
 	n = poll(&pollfd, 1, INFTIM);
 	if (n < 0)
-		err(-1, "poll");
+		err(-1, "test_pdfork: poll");
 	if (n != 1)
-		errx(-1, "poll returned %d", n);
+		errx(-1, "test_pdfork: poll returned %d", n);
 	close(fd);
 
 	benchmark_start();
@@ -447,9 +447,9 @@
 		pollfd.revents = 0;
 		n = poll(&pollfd, 1, INFTIM);
 		if (n < 0)
-			err(-1, "poll");
+			err(-1, "test_pdfork: poll");
 		if (n != 1)
-			errx(-1, "poll returned %d", n);
+			errx(-1, "test_pdfork: poll returned %d", n);
 		close(fd);
 	}
 	benchmark_stop();
@@ -467,7 +467,7 @@
 
 	pid = fork();
 	if (pid < 0)
-		err(-1, "test_fork: fork");
+		err(-1, "test_fork_exec: fork");
 	if (pid == 0) {
 		(void)execve(USR_BIN_TRUE, execve_args, environ);
 		err(-1, "execve");
@@ -478,13 +478,13 @@
 	for (i = 0; i < num; i++) {
 		pid = fork();
 		if (pid < 0)
-			err(-1, "test_fork: fork");
+			err(-1, "test_fork_exec: fork");
 		if (pid == 0) {
 			(void)execve(USR_BIN_TRUE, execve_args, environ);
-			err(-1, "execve");
+			err(-1, "test_fork_exec: execve");
 		}
 		if (waitpid(pid, NULL, 0) < 0)
-			err(-1, "test_fork: waitpid");
+			err(-1, "test_fork_exec: waitpid");
 	}
 	benchmark_stop();
 }
@@ -497,24 +497,24 @@
 
 	pid = vfork();
 	if (pid < 0)
-		err(-1, "test_vfork: vfork");
+		err(-1, "test_vfork_exec: vfork");
 	if (pid == 0) {
 		(void)execve(USR_BIN_TRUE, execve_args, environ);
-		err(-1, "execve");
+		err(-1, "test_vfork_exec: execve");
 	}
 	if (waitpid(pid, NULL, 0) < 0)
-		err(-1, "test_vfork: waitpid");
+		err(-1, "test_vfork_exec: waitpid");
 	benchmark_start();
 	for (i = 0; i < num; i++) {
 		pid = vfork();
 		if (pid < 0)
-			err(-1, "test_vfork: vfork");
+			err(-1, "test_vfork_exec: vfork");
 		if (pid == 0) {
 			(void)execve(USR_BIN_TRUE, execve_args, environ);
 			err(-1, "execve");
 		}
 		if (waitpid(pid, NULL, 0) < 0)
-			err(-1, "test_vfork: waitpid");
+			err(-1, "test_vfork_exec: waitpid");
 	}
 	benchmark_stop();
 }
@@ -528,38 +528,38 @@
 
 	pid = pdfork(&fd);
 	if (pid < 0)
-		err(-1, "test_pdfork: pdfork");
+		err(-1, "test_pdfork_exec: pdfork");
 	if (pid == 0) {
 		(void)execve(USR_BIN_TRUE, execve_args, environ);
-		err(-1, "execve");
+		err(-1, "test_pdfork_exec: execve");
 	}
 	pollfd.fd = fd;
 	pollfd.events = POLLHUP;
 	pollfd.revents = 0;
 	n = poll(&pollfd, 1, INFTIM);
 	if (n < 0)
-		err(-1, "poll");
+		err(-1, "test_pdfork_exec: poll");
 	if (n != 1)
-		errx(-1, "poll returned %d", n);
+		errx(-1, "test_pdfork_exec: poll returned %d", n);
 	close(fd);
 
 	benchmark_start();
 	for (i = 0; i < num; i++) {
 		pid = pdfork(&fd);
 		if (pid < 0)
-			err(-1, "test_pdfork: pdfork");
+			err(-1, "test_pdfork_exec: pdfork");
 		if (pid == 0) {
 			(void)execve(USR_BIN_TRUE, execve_args, environ);
-			err(-1, "execve");
+			err(-1, "test_pdfork_exec: execve");
 		}
 		pollfd.fd = fd;
 		pollfd.events = POLLHUP;
 		pollfd.revents = 0;
 		n = poll(&pollfd, 1, INFTIM);
 		if (n < 0)
-			err(-1, "poll");
+			err(-1, "test_pdfork_exec: poll");
 		if (n != 1)
-			errx(-1, "poll returned %d", n);
+			errx(-1, "test_pdfork_exec: poll returned %d", n);
 		close(fd);
 	}
 	benchmark_stop();