Fix: Add failover for platforms without nproc

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/configure.ac b/configure.ac
index ae75a3be66f9ec8309f46a6cdb7ed483e83356ad..3cc8dd2a062ae9fa2fdaa43ca672e8fec3d86f2d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,16 @@ AC_PROG_CC_STDC
 AC_PROG_AWK
 AC_PROG_MAKE_SET
 AC_CHECK_PROGS(NPROC, [nproc gnproc])
+AC_CHECK_PROGS(GETCONF, [getconf])
+AS_IF([test "x$NPROC" != "x"],
+       [NPROC_CMD=$NPROC],
+       [AS_IF([test "x$GETCONF" != "x"],
+               [NPROC_CMD="$GETCONF _NPROCESSORS_ONLN"],
+               [NPROC_CMD="echo 1"]
+       )]
+)
+AC_SUBST([NPROC_CMD], [$NPROC_CMD])
+
 LT_INIT
 
 # Checks for typedefs, structures, and compiler characteristics.

diff --git a/tests/regression/regression_tests.in b/tests/regression/regression_tests.in
index a66da24d0493551a782d7fdbb82b7dee587be14d..26df1109e375c7f36ad867a5afb37c1f6d42f938 100644 (file)
--- a/tests/regression/regression_tests.in
+++ b/tests/regression/regression_tests.in
@@ -1,61 +1,61 @@
 ./test_urcu_fork
-./rcutorture_urcu `@NPROC@` perf 1 callrcu_global
-./rcutorture_urcu_signal `@NPROC@` perf 1 callrcu_global
-./rcutorture_urcu_mb `@NPROC@` perf 1 callrcu_global
-./rcutorture_urcu_bp `@NPROC@` perf 1 callrcu_global
-./rcutorture_urcu_qsbr `@NPROC@` perf 1 callrcu_global
-./rcutorture_urcu `@NPROC@` rperf 1 callrcu_global
-./rcutorture_urcu_signal `@NPROC@` rperf 1 callrcu_global
-./rcutorture_urcu_mb `@NPROC@` rperf 1 callrcu_global
-./rcutorture_urcu_bp `@NPROC@` rperf 1 callrcu_global
-./rcutorture_urcu_qsbr `@NPROC@` rperf 1 callrcu_global
-./rcutorture_urcu `@NPROC@` uperf 1 callrcu_global
-./rcutorture_urcu_signal `@NPROC@` uperf 1 callrcu_global
-./rcutorture_urcu_mb `@NPROC@` uperf 1 callrcu_global
-./rcutorture_urcu_bp `@NPROC@` uperf 1 callrcu_global
-./rcutorture_urcu_qsbr `@NPROC@` uperf 1 callrcu_global
-./rcutorture_urcu `@NPROC@` stress 1 callrcu_global
-./rcutorture_urcu_signal `@NPROC@` stress 1 callrcu_global
-./rcutorture_urcu_mb `@NPROC@` stress 1 callrcu_global
-./rcutorture_urcu_bp `@NPROC@` stress 1 callrcu_global
-./rcutorture_urcu_qsbr `@NPROC@` stress 1 callrcu_global
-./rcutorture_urcu `@NPROC@` perf 1 callrcu_percpu
-./rcutorture_urcu_signal `@NPROC@` perf 1 callrcu_percpu
-./rcutorture_urcu_mb `@NPROC@` perf 1 callrcu_percpu
-./rcutorture_urcu_bp `@NPROC@` perf 1 callrcu_percpu
-./rcutorture_urcu_qsbr `@NPROC@` perf 1 callrcu_percpu
-./rcutorture_urcu `@NPROC@` rperf 1 callrcu_percpu
-./rcutorture_urcu_signal `@NPROC@` rperf 1 callrcu_percpu
-./rcutorture_urcu_mb `@NPROC@` rperf 1 callrcu_percpu
-./rcutorture_urcu_bp `@NPROC@` rperf 1 callrcu_percpu
-./rcutorture_urcu_qsbr `@NPROC@` rperf 1 callrcu_percpu
-./rcutorture_urcu `@NPROC@` uperf 1 callrcu_percpu
-./rcutorture_urcu_signal `@NPROC@` uperf 1 callrcu_percpu
-./rcutorture_urcu_mb `@NPROC@` uperf 1 callrcu_percpu
-./rcutorture_urcu_bp `@NPROC@` uperf 1 callrcu_percpu
-./rcutorture_urcu_qsbr `@NPROC@` uperf 1 callrcu_percpu
-./rcutorture_urcu `@NPROC@` stress 1 callrcu_percpu
-./rcutorture_urcu_signal `@NPROC@` stress 1 callrcu_percpu
-./rcutorture_urcu_mb `@NPROC@` stress 1 callrcu_percpu
-./rcutorture_urcu_bp `@NPROC@` stress 1 callrcu_percpu
-./rcutorture_urcu_qsbr `@NPROC@` stress 1 callrcu_percpu
-./rcutorture_urcu `@NPROC@` perf 1 callrcu_perthread
-./rcutorture_urcu_signal `@NPROC@` perf 1 callrcu_perthread
-./rcutorture_urcu_mb `@NPROC@` perf 1 callrcu_perthread
-./rcutorture_urcu_bp `@NPROC@` perf 1 callrcu_perthread
-./rcutorture_urcu_qsbr `@NPROC@` perf 1 callrcu_perthread
-./rcutorture_urcu `@NPROC@` rperf 1 callrcu_perthread
-./rcutorture_urcu_signal `@NPROC@` rperf 1 callrcu_perthread
-./rcutorture_urcu_mb `@NPROC@` rperf 1 callrcu_perthread
-./rcutorture_urcu_bp `@NPROC@` rperf 1 callrcu_perthread
-./rcutorture_urcu_qsbr `@NPROC@` rperf 1 callrcu_perthread
-./rcutorture_urcu `@NPROC@` uperf 1 callrcu_perthread
-./rcutorture_urcu_signal `@NPROC@` uperf 1 callrcu_perthread
-./rcutorture_urcu_mb `@NPROC@` uperf 1 callrcu_perthread
-./rcutorture_urcu_bp `@NPROC@` uperf 1 callrcu_perthread
-./rcutorture_urcu_qsbr `@NPROC@` uperf 1 callrcu_perthread
-./rcutorture_urcu `@NPROC@` stress 1 callrcu_perthread
-./rcutorture_urcu_signal `@NPROC@` stress 1 callrcu_perthread
-./rcutorture_urcu_mb `@NPROC@` stress 1 callrcu_perthread
-./rcutorture_urcu_bp `@NPROC@` stress 1 callrcu_perthread
-./rcutorture_urcu_qsbr `@NPROC@` stress 1 callrcu_perthread
+./rcutorture_urcu `@NPROC_CMD@` perf 1 callrcu_global
+./rcutorture_urcu_signal `@NPROC_CMD@` perf 1 callrcu_global
+./rcutorture_urcu_mb `@NPROC_CMD@` perf 1 callrcu_global
+./rcutorture_urcu_bp `@NPROC_CMD@` perf 1 callrcu_global
+./rcutorture_urcu_qsbr `@NPROC_CMD@` perf 1 callrcu_global
+./rcutorture_urcu `@NPROC_CMD@` rperf 1 callrcu_global
+./rcutorture_urcu_signal `@NPROC_CMD@` rperf 1 callrcu_global
+./rcutorture_urcu_mb `@NPROC_CMD@` rperf 1 callrcu_global
+./rcutorture_urcu_bp `@NPROC_CMD@` rperf 1 callrcu_global
+./rcutorture_urcu_qsbr `@NPROC_CMD@` rperf 1 callrcu_global
+./rcutorture_urcu `@NPROC_CMD@` uperf 1 callrcu_global
+./rcutorture_urcu_signal `@NPROC_CMD@` uperf 1 callrcu_global
+./rcutorture_urcu_mb `@NPROC_CMD@` uperf 1 callrcu_global
+./rcutorture_urcu_bp `@NPROC_CMD@` uperf 1 callrcu_global
+./rcutorture_urcu_qsbr `@NPROC_CMD@` uperf 1 callrcu_global
+./rcutorture_urcu `@NPROC_CMD@` stress 1 callrcu_global
+./rcutorture_urcu_signal `@NPROC_CMD@` stress 1 callrcu_global
+./rcutorture_urcu_mb `@NPROC_CMD@` stress 1 callrcu_global
+./rcutorture_urcu_bp `@NPROC_CMD@` stress 1 callrcu_global
+./rcutorture_urcu_qsbr `@NPROC_CMD@` stress 1 callrcu_global
+./rcutorture_urcu `@NPROC_CMD@` perf 1 callrcu_percpu
+./rcutorture_urcu_signal `@NPROC_CMD@` perf 1 callrcu_percpu
+./rcutorture_urcu_mb `@NPROC_CMD@` perf 1 callrcu_percpu
+./rcutorture_urcu_bp `@NPROC_CMD@` perf 1 callrcu_percpu
+./rcutorture_urcu_qsbr `@NPROC_CMD@` perf 1 callrcu_percpu
+./rcutorture_urcu `@NPROC_CMD@` rperf 1 callrcu_percpu
+./rcutorture_urcu_signal `@NPROC_CMD@` rperf 1 callrcu_percpu
+./rcutorture_urcu_mb `@NPROC_CMD@` rperf 1 callrcu_percpu
+./rcutorture_urcu_bp `@NPROC_CMD@` rperf 1 callrcu_percpu
+./rcutorture_urcu_qsbr `@NPROC_CMD@` rperf 1 callrcu_percpu
+./rcutorture_urcu `@NPROC_CMD@` uperf 1 callrcu_percpu
+./rcutorture_urcu_signal `@NPROC_CMD@` uperf 1 callrcu_percpu
+./rcutorture_urcu_mb `@NPROC_CMD@` uperf 1 callrcu_percpu
+./rcutorture_urcu_bp `@NPROC_CMD@` uperf 1 callrcu_percpu
+./rcutorture_urcu_qsbr `@NPROC_CMD@` uperf 1 callrcu_percpu
+./rcutorture_urcu `@NPROC_CMD@` stress 1 callrcu_percpu
+./rcutorture_urcu_signal `@NPROC_CMD@` stress 1 callrcu_percpu
+./rcutorture_urcu_mb `@NPROC_CMD@` stress 1 callrcu_percpu
+./rcutorture_urcu_bp `@NPROC_CMD@` stress 1 callrcu_percpu
+./rcutorture_urcu_qsbr `@NPROC_CMD@` stress 1 callrcu_percpu
+./rcutorture_urcu `@NPROC_CMD@` perf 1 callrcu_perthread
+./rcutorture_urcu_signal `@NPROC_CMD@` perf 1 callrcu_perthread
+./rcutorture_urcu_mb `@NPROC_CMD@` perf 1 callrcu_perthread
+./rcutorture_urcu_bp `@NPROC_CMD@` perf 1 callrcu_perthread
+./rcutorture_urcu_qsbr `@NPROC_CMD@` perf 1 callrcu_perthread
+./rcutorture_urcu `@NPROC_CMD@` rperf 1 callrcu_perthread
+./rcutorture_urcu_signal `@NPROC_CMD@` rperf 1 callrcu_perthread
+./rcutorture_urcu_mb `@NPROC_CMD@` rperf 1 callrcu_perthread
+./rcutorture_urcu_bp `@NPROC_CMD@` rperf 1 callrcu_perthread
+./rcutorture_urcu_qsbr `@NPROC_CMD@` rperf 1 callrcu_perthread
+./rcutorture_urcu `@NPROC_CMD@` uperf 1 callrcu_perthread
+./rcutorture_urcu_signal `@NPROC_CMD@` uperf 1 callrcu_perthread
+./rcutorture_urcu_mb `@NPROC_CMD@` uperf 1 callrcu_perthread
+./rcutorture_urcu_bp `@NPROC_CMD@` uperf 1 callrcu_perthread
+./rcutorture_urcu_qsbr `@NPROC_CMD@` uperf 1 callrcu_perthread
+./rcutorture_urcu `@NPROC_CMD@` stress 1 callrcu_perthread
+./rcutorture_urcu_signal `@NPROC_CMD@` stress 1 callrcu_perthread
+./rcutorture_urcu_mb `@NPROC_CMD@` stress 1 callrcu_perthread
+./rcutorture_urcu_bp `@NPROC_CMD@` stress 1 callrcu_perthread
+./rcutorture_urcu_qsbr `@NPROC_CMD@` stress 1 callrcu_perthread