Module Name:    src
Committed By:   jruoho
Date:           Sun May  1 09:09:35 UTC 2011

Modified Files:
        src/distrib/sets/lists/tests: mi
        src/tests/syscall: Makefile
Added Files:
        src/tests/syscall: t_nanosleep.c

Log Message:
Few basic tests for nanosleep(2).


To generate a diff of this commit:
cvs rdiff -u -r1.314 -r1.315 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.24 -r1.25 src/tests/syscall/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/syscall/t_nanosleep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.314 src/distrib/sets/lists/tests/mi:1.315
--- src/distrib/sets/lists/tests/mi:1.314	Sun May  1 07:22:40 2011
+++ src/distrib/sets/lists/tests/mi	Sun May  1 09:09:35 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.314 2011/05/01 07:22:40 jruoho Exp $
+# $NetBSD: mi,v 1.315 2011/05/01 09:09:35 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -604,6 +604,7 @@
 ./usr/libdata/debug/usr/tests/syscall/t_mmap.debug			tests-syscall-debug	debug,atf
 ./usr/libdata/debug/usr/tests/syscall/t_mprotect.debug			tests-syscall-debug	debug,atf
 ./usr/libdata/debug/usr/tests/syscall/t_msync.debug			tests-syscall-debug	debug,atf
+./usr/libdata/debug/usr/tests/syscall/t_nanosleep.debug			tests-syscall-debug	debug,atf
 ./usr/libdata/debug/usr/tests/syscall/t_setrlimit.debug			tests-syscall-debug	debug,atf
 ./usr/libdata/debug/usr/tests/syscall/t_setuid.debug			tests-syscall-debug	debug,atf
 ./usr/libdata/debug/usr/tests/syscall/t_timer.debug			tests-syscall-debug	debug,atf
@@ -2279,6 +2280,7 @@
 ./usr/tests/syscall/t_mmap			tests-syscall-tests	atf
 ./usr/tests/syscall/t_mprotect			tests-syscall-tests	atf
 ./usr/tests/syscall/t_msync			tests-syscall-tests	atf
+./usr/tests/syscall/t_nanosleep			tests-syscall-tests	atf
 ./usr/tests/syscall/t_setrlimit			tests-syscall-tests	atf
 ./usr/tests/syscall/t_setuid			tests-syscall-tests	atf
 ./usr/tests/syscall/t_timer			tests-syscall-tests	atf

Index: src/tests/syscall/Makefile
diff -u src/tests/syscall/Makefile:1.24 src/tests/syscall/Makefile:1.25
--- src/tests/syscall/Makefile:1.24	Sun May  1 07:22:40 2011
+++ src/tests/syscall/Makefile	Sun May  1 09:09:35 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2011/05/01 07:22:40 jruoho Exp $
+# $NetBSD: Makefile,v 1.25 2011/05/01 09:09:35 jruoho Exp $
 
 .include <bsd.own.mk>
 
@@ -6,7 +6,7 @@
 
 TESTS_C+=	t_access t_cmsg t_dup t_fsync
 TESTS_C+=	t_getgroups t_getpid t_getrusage t_getsid t_gettimeofday
-TESTS_C+=	t_kill t_mmap t_mprotect t_msync
+TESTS_C+=	t_kill t_mmap t_mprotect t_msync t_nanosleep
 TESTS_C+=	t_setrlimit t_setuid t_timer t_umask
 
 LDADD.t_getpid+=	-lpthread

Added files:

Index: src/tests/syscall/t_nanosleep.c
diff -u /dev/null src/tests/syscall/t_nanosleep.c:1.1
--- /dev/null	Sun May  1 09:09:35 2011
+++ src/tests/syscall/t_nanosleep.c	Sun May  1 09:09:35 2011
@@ -0,0 +1,206 @@
+/* $NetBSD: t_nanosleep.c,v 1.1 2011/05/01 09:09:35 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_nanosleep.c,v 1.1 2011/05/01 09:09:35 jruoho Exp $");
+
+#include <sys/time.h>
+#include <sys/wait.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <time.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sysexits.h>
+#include <unistd.h>
+
+static void
+handler(int signo)
+{
+	/* Nothing. */
+}
+
+ATF_TC(nanosleep_basic);
+ATF_TC_HEAD(nanosleep_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test that nanosleep(2) works");
+}
+
+ATF_TC_BODY(nanosleep_basic, tc)
+{
+	static const size_t maxiter = 1; /* XXX */
+	struct timespec ts1, ts2, tsn;
+	pid_t pid;
+	size_t i;
+	int sta;
+
+	/*
+	 * Fork a child, suspend the execution of it,
+	 * and verify that it was actually suspended.
+	 */
+	for (i = 0; i < maxiter; i++) {
+
+		pid = fork();
+		ATF_REQUIRE(pid >= 0);
+
+		if (pid == 0) {
+
+			tsn.tv_sec = 1;
+			tsn.tv_nsec = i * 10000;
+
+			(void)memset(&ts1, 0, sizeof(struct timespec));
+			(void)memset(&ts2, 0, sizeof(struct timespec));
+
+			if (clock_gettime(CLOCK_MONOTONIC, &ts1) != 0)
+				_exit(EX_OSERR);
+
+			if (nanosleep(&tsn, NULL) != 0)
+				_exit(EX_OSERR);
+
+			if (clock_gettime(CLOCK_MONOTONIC, &ts2) != 0)
+				_exit(EX_OSERR);
+
+			(void)fprintf(stderr,
+			    "tsn: sec = %lu, nsec = %lu\n\t"
+			    "ts1: sec = %lu, nsec = %lu\n\t"
+			    "ts2: sec = %lu, nsec = %lu\n",
+			    tsn.tv_sec, tsn.tv_nsec,
+			    ts1.tv_sec, ts1.tv_nsec,
+			    ts2.tv_sec, ts2.tv_nsec);
+
+			/*
+			 * Assume accuracy of the resolution in seconds.
+			 */
+			if (ts2.tv_sec - tsn.tv_sec != ts1.tv_sec)
+				_exit(EX_DATAERR);
+
+			if (ts2.tv_nsec - tsn.tv_nsec < ts1.tv_nsec)
+				_exit(EX_DATAERR);
+
+			_exit(EXIT_SUCCESS);
+		}
+
+		(void)wait(&sta);
+
+		if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS) {
+
+			if (WEXITSTATUS(sta) == EX_DATAERR)
+				atf_tc_fail("inaccuracies in sleep time");
+
+			atf_tc_fail("system call failed");
+		}
+	}
+}
+
+ATF_TC(nanosleep_err);
+ATF_TC_HEAD(nanosleep_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from nanosleep(2)");
+}
+
+ATF_TC_BODY(nanosleep_err, tc)
+{
+	struct timespec ts;
+
+	ts.tv_sec = -1;
+	ts.tv_nsec = 1000;
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, nanosleep(&ts, NULL) == -1);
+
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EFAULT, nanosleep((void *)-1, NULL) == -1);
+}
+
+ATF_TC(nanosleep_sig);
+ATF_TC_HEAD(nanosleep_sig, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test signal for nanosleep(2)");
+}
+
+ATF_TC_BODY(nanosleep_sig, tc)
+{
+	struct timespec tsn, tsr;
+	pid_t pid;
+	int sta;
+
+	/*
+	 * Test that a signal interrupts nanosleep(2).
+	 *
+	 * (In which case the return value should be -1 and the
+	 * second parameter should contain the unslept time.)
+	 */
+	pid = fork();
+
+	ATF_REQUIRE(pid >= 0);
+	ATF_REQUIRE(signal(SIGINT, handler) == 0);
+
+	if (pid == 0) {
+
+		tsn.tv_sec = 10;
+		tsn.tv_nsec = 0;
+
+		tsr.tv_sec = 0;
+		tsr.tv_nsec = 0;
+
+		errno = 0;
+
+		if (nanosleep(&tsn, &tsr) != -1)
+			_exit(EXIT_FAILURE);
+
+		if (errno != EINTR)
+			_exit(EXIT_FAILURE);
+
+		if (tsr.tv_sec == 0 && tsr.tv_nsec == 0)
+			_exit(EXIT_FAILURE);
+
+		_exit(EXIT_SUCCESS);
+	}
+
+	(void)sleep(1);
+	(void)kill(pid, SIGINT);
+	(void)wait(&sta);
+
+	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
+		atf_tc_fail("signal did not interrupt nanosleep(2)");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, nanosleep_basic);
+	ATF_TP_ADD_TC(tp, nanosleep_err);
+	ATF_TP_ADD_TC(tp, nanosleep_sig);
+
+	return atf_no_error();
+}

Reply via email to