Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src PR/53908: Alex Raschi: Test that require modules belong in m...
details: https://anonhg.NetBSD.org/src/rev/4307a79c1984
branches: trunk
changeset: 448194:4307a79c1984
user: christos <christos%NetBSD.org@localhost>
date: Fri Jan 25 18:33:58 2019 +0000
description:
PR/53908: Alex Raschi: Test that require modules belong in modules; move the
threadpool test from kernel to modules.
diffstat:
distrib/sets/lists/tests/mi | 3 +-
distrib/sets/lists/tests/module.mi | 10 +-
tests/kernel/Makefile | 5 +-
tests/kernel/t_threadpool.sh | 140 -----
tests/modules/Makefile | 4 +-
tests/modules/threadpool_tester/Makefile | 14 +
tests/modules/threadpool_tester/threadpool_tester.c | 502 ++++++++++++++++++++
7 files changed, 528 insertions(+), 150 deletions(-)
diffs (truncated from 750 to 300 lines):
diff -r 96422d449e96 -r 4307a79c1984 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi Fri Jan 25 18:31:44 2019 +0000
+++ b/distrib/sets/lists/tests/mi Fri Jan 25 18:33:58 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.803 2019/01/17 02:49:11 knakahara Exp $
+# $NetBSD: mi,v 1.804 2019/01/25 18:33:58 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2205,7 +2205,6 @@
./usr/tests/kernel/t_subr_prf tests-kernel-tests compattestfile,atf
./usr/tests/kernel/t_sysctl tests-kernel-tests compattestfile,atf
./usr/tests/kernel/t_sysv tests-kernel-tests compattestfile,atf
-./usr/tests/kernel/t_threadpool tests-kernel-tests compattestfile,atf
./usr/tests/kernel/t_time tests-obsolete obsolete
./usr/tests/kernel/t_timeleft tests-kernel-tests compattestfile,atf
./usr/tests/kernel/t_trapsignal tests-kernel-tests compattestfile,atf
diff -r 96422d449e96 -r 4307a79c1984 distrib/sets/lists/tests/module.mi
--- a/distrib/sets/lists/tests/module.mi Fri Jan 25 18:31:44 2019 +0000
+++ b/distrib/sets/lists/tests/module.mi Fri Jan 25 18:33:58 2019 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: module.mi,v 1.14 2018/12/24 16:58:54 thorpej Exp $
+# $NetBSD: module.mi,v 1.15 2019/01/25 18:33:58 christos Exp $
#
# These are only made for ports doing modules.
#
-./usr/tests/kernel/threadpool_tester tests-kernel-tests compattestfile,atf
-./usr/tests/kernel/threadpool_tester/threadpool_tester.kmod tests-kernel-tests compattestfile,atf
+./usr/tests/kernel/t_threadpool tests-obsolete obsolete
+./usr/tests/kernel/threadpool_tester tests-obsolete obsolete
+./usr/tests/kernel/threadpool_tester/threadpool_tester.kmod tests-obsolete obsolete
./usr/tests/modules/Atffile tests-sys-tests atf,rump
./usr/tests/modules/Kyuafile tests-sys-tests atf,rump,kyua
./usr/tests/modules/k_helper tests-sys-tests atf,rump
@@ -19,3 +20,6 @@
./usr/tests/modules/t_klua_pr_52864 tests-sys-tests atf,rump
./usr/tests/modules/t_modctl tests-sys-tests atf,rump
./usr/tests/modules/t_modload tests-sys-tests atf,rump
+./usr/tests/modules/t_threadpool tests-sys-tests atf,compattestfile
+./usr/tests/modules/threadpool_tester tests-sys-tests atf,compattestfile
+./usr/tests/modules/threadpool_tester/threadpool_tester.kmod tests-sys-tests atf,compattestfile
diff -r 96422d449e96 -r 4307a79c1984 tests/kernel/Makefile
--- a/tests/kernel/Makefile Fri Jan 25 18:31:44 2019 +0000
+++ b/tests/kernel/Makefile Fri Jan 25 18:33:58 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2018/12/24 16:58:54 thorpej Exp $
+# $NetBSD: Makefile,v 1.56 2019/01/25 18:33:58 christos Exp $
NOMAN= # defined
@@ -25,9 +25,6 @@
TESTS_SH+= t_interp
TESTS_SH+= t_procpath
-SUBDIR+= threadpool_tester
-TESTS_SH+= t_threadpool
-
BINDIR= ${TESTSDIR}
PROGS= h_ps_strings1
PROGS+= h_ps_strings2
diff -r 96422d449e96 -r 4307a79c1984 tests/kernel/t_threadpool.sh
--- a/tests/kernel/t_threadpool.sh Fri Jan 25 18:31:44 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-# $NetBSD: t_threadpool.sh,v 1.2 2018/12/28 16:01:53 thorpej Exp $
-#
-# Copyright (c) 2018 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Jason R. Thorpe.
-#
-# 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.
-#
-
-# Pick an arbitrary priority that is not likely to be used.
-tp_pri=5
-
-# The kernel test jig includes a 1 second delay in the job. We need to
-# wait longer for it to complete.
-job_delay=2
-
-read_sysctl() {
- echo "${1} = ${2}" >expout
- atf_check -s eq:0 -o file:expout -e empty sysctl ${1}
-}
-
-write_sysctl() {
- atf_check -s eq:0 -o ignore -e empty sysctl -w "${1}=${2}"
-}
-
-write_sysctl_fail() {
- echo "${3}" >experr
- atf_check -s eq:1 -o ignore -e file:experr sysctl -w "${1}=${2}"
-}
-
-atf_test_case unbound cleanup
-unbound_head() {
- atf_set "descr" "Test unbound thread pools"
- atf_set "require.user" "root"
-}
-unbound_body() {
- modload $(atf_get_srcdir)/threadpool_tester/threadpool_tester.kmod
- if [ $? -ne 0 ]; then
- atf_skip "cannot load threadpool_tester.kmod"
- fi
-
- # Ensure that the state is clean.
- read_sysctl kern.threadpool_tester.test_value 0
-
- # Create an unbound pool.
- write_sysctl kern.threadpool_tester.get_unbound $tp_pri
-
- # Do it again. We expect this to fail, but the test jig will
- # do some additional threadpool object lifecycle validation.
- # (It will not hold the additional reference.)
- write_sysctl_fail kern.threadpool_tester.get_unbound $tp_pri \
- "sysctl: kern.threadpool_tester.get_unbound: File exists"
-
- # Schedule the test jig job on the pool.
- # Wait for a short period of time and then check that the job
- # successfully ran.
- write_sysctl kern.threadpool_tester.run_unbound $tp_pri
- sleep $job_delay
- read_sysctl kern.threadpool_tester.test_value 1
-
- # ...and again.
- write_sysctl kern.threadpool_tester.run_unbound $tp_pri
- sleep $job_delay
- read_sysctl kern.threadpool_tester.test_value 2
-
- # Now destroy the threadpool.
- write_sysctl kern.threadpool_tester.put_unbound $tp_pri
-}
-unbound_cleanup() {
- modunload threadpool_tester >/dev/null 2>&1
-}
-
-atf_test_case percpu cleanup
-percpu_head() {
- atf_set "descr" "Test percpu thread pools"
- atf_set "require.user" "root"
-}
-percpu_body() {
- modload $(atf_get_srcdir)/threadpool_tester/threadpool_tester.kmod
- if [ $? -ne 0 ]; then
- atf_skip "cannot load threadpool_tester.kmod"
- fi
-
- # Ensure that the state is clean.
- read_sysctl kern.threadpool_tester.test_value 0
-
- # Create an percpu pool.
- write_sysctl kern.threadpool_tester.get_percpu $tp_pri
-
- # Do it again. We expect this to fail, but the test jig will
- # do some additional threadpool object lifecycle validation.
- # (It will not hold the additional reference.)
- write_sysctl_fail kern.threadpool_tester.get_percpu $tp_pri \
- "sysctl: kern.threadpool_tester.get_percpu: File exists"
-
- # Schedule the test jig job on the pool.
- # Wait for a short period of time and then check that the job
- # successfully ran.
- write_sysctl kern.threadpool_tester.run_percpu $tp_pri
- sleep $job_delay
- read_sysctl kern.threadpool_tester.test_value 1
-
- # ...and again.
- write_sysctl kern.threadpool_tester.run_percpu $tp_pri
- sleep $job_delay
- read_sysctl kern.threadpool_tester.test_value 2
-
- # Now destroy the threadpool.
- write_sysctl kern.threadpool_tester.put_percpu $tp_pri
-}
-percpu_cleanup() {
- modunload threadpool_tester >/dev/null 2>&1
-}
-
-atf_init_test_cases()
-{
- atf_add_test_case unbound
- atf_add_test_case percpu
-}
diff -r 96422d449e96 -r 4307a79c1984 tests/modules/Makefile
--- a/tests/modules/Makefile Fri Jan 25 18:31:44 2019 +0000
+++ b/tests/modules/Makefile Fri Jan 25 18:33:58 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/01/08 14:17:15 martin Exp $
+# $NetBSD: Makefile,v 1.14 2019/01/25 18:33:59 christos Exp $
.include <bsd.own.mk>
@@ -18,10 +18,12 @@
TESTS_SH= t_abi_uvm
TESTS_SH+= t_modload
TESTS_SH+= t_klua_pr_52864
+TESTS_SH+= t_threadpool
SUBDIR= k_helper
SUBDIR+= k_helper2
SUBDIR+= k_helper3
SUBDIR+= k_uvm
+SUBDIR+= threadpool_tester
.include <bsd.test.mk>
diff -r 96422d449e96 -r 4307a79c1984 tests/modules/threadpool_tester/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/modules/threadpool_tester/Makefile Fri Jan 25 18:33:58 2019 +0000
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2019/01/25 18:33:59 christos Exp $
+
+.include <bsd.own.mk>
+
+KMOD= threadpool_tester
+KMODULEDIR= ${DESTDIR}/${TESTSBASE}/modules/${KMOD}
+
+SRCS= threadpool_tester.c
+
+ATFFILE= no
+NOMAN= # defined
+
+.include <bsd.test.mk>
+.include <bsd.kmodule.mk>
diff -r 96422d449e96 -r 4307a79c1984 tests/modules/threadpool_tester/threadpool_tester.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/modules/threadpool_tester/threadpool_tester.c Fri Jan 25 18:33:58 2019 +0000
@@ -0,0 +1,502 @@
+/* $NetBSD: threadpool_tester.c,v 1.1 2019/01/25 18:33:59 christos Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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>
+__KERNEL_RCSID(0, "$NetBSD: threadpool_tester.c,v 1.1 2019/01/25 18:33:59 christos Exp $");
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/sysctl.h>
+#include <sys/threadpool.h>
+
+MODULE(MODULE_CLASS_MISC, threadpool_tester, NULL);
+
+#ifdef THREADPOOL_VERBOSE
+#define TP_LOG(x) printf x
+#else
+#define TP_LOG(x) /* nothing */
+#endif /* THREADPOOL_VERBOSE */
+
+static struct tester_context {
+ kmutex_t ctx_mutex;
+ struct sysctllog *ctx_sysctllog;
+ struct threadpool *ctx_unbound[PRI_COUNT + 1];
Home |
Main Index |
Thread Index |
Old Index