From d268885ad55f84ce6465992bc82b47282b296a4b Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 15 Dec 2021 14:53:52 -0500 Subject: [PATCH] Build and run tests as C++ programs Build and run all tests as C++ programs in addition to C. This helps get confidence that rseq, when used from a C++ program, behaves well. Change-Id: I68d35d9cadcb859aaa6be4a5c620a6c21075c238 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .gitignore | 6 + configure.ac | 11 + include/rseq/rseq.h | 2 +- m4/ax_cxx_compile_stdcxx.m4 | 951 ++++++++++++++++++++++++++++ tests/Makefile.am | 43 +- tests/basic_percpu_ops_test.c | 4 +- tests/basic_percpu_ops_test_cxx.cpp | 3 + tests/basic_test_cxx.cpp | 3 + tests/param_test.c | 10 +- tests/param_test_cxx.cpp | 3 + tests/run_param_test_cxx.tap | 112 ++++ tests/utils/tap.h | 8 + 12 files changed, 1145 insertions(+), 11 deletions(-) create mode 100644 m4/ax_cxx_compile_stdcxx.m4 create mode 100644 tests/basic_percpu_ops_test_cxx.cpp create mode 100644 tests/basic_test_cxx.cpp create mode 100644 tests/param_test_cxx.cpp create mode 100755 tests/run_param_test_cxx.tap diff --git a/.gitignore b/.gitignore index 26c5e87..9d59757 100644 --- a/.gitignore +++ b/.gitignore @@ -53,10 +53,15 @@ dkms.conf /src/librseq.pc /tests/basic_percpu_ops_test.tap +/tests/basic_percpu_ops_test_cxx.tap /tests/basic_test.tap +/tests/basic_test_cxx.tap /tests/param_test +/tests/param_test_cxx /tests/param_test_benchmark +/tests/param_test_benchmark_cxx /tests/param_test_compare_twice +/tests/param_test_compare_twice_cxx #automake /include/config.h @@ -90,6 +95,7 @@ Makefile /libtool /include/stamp-h1 /include/config.h.in +/include/config.h.in~ /config.status /autom4te.cache/ /config diff --git a/configure.ac b/configure.ac index c13be33..4d04530 100644 --- a/configure.ac +++ b/configure.ac @@ -81,6 +81,14 @@ AC_TYPE_UINT32_T AC_TYPE_UINT64_T +## ## +## C++ compiler checks ## +## ## + +# Require a C++11 compiler without GNU extensions (-std=c++11) +AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory]) + + ## ## ## Header checks ## ## ## @@ -156,6 +164,9 @@ AC_SUBST(AM_CPPFLAGS) AM_CFLAGS="-Wall -Wextra $PTHREAD_CFLAGS" AC_SUBST(AM_CFLAGS) +AM_CXXFLAGS="-Wall -Wextra $PTHREAD_CFLAGS" +AC_SUBST(AM_CXXFLAGS) + ## ## ## Output files generated by configure ## diff --git a/include/rseq/rseq.h b/include/rseq/rseq.h index 3cb4edc..23e7ff5 100644 --- a/include/rseq/rseq.h +++ b/include/rseq/rseq.h @@ -68,7 +68,7 @@ extern unsigned int rseq_flags; static inline struct rseq *rseq_get_abi(void) { - return (struct rseq *) (rseq_thread_pointer() + rseq_offset); + return (struct rseq *) ((uintptr_t) rseq_thread_pointer() + rseq_offset); } # ifdef __cplusplus diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 new file mode 100644 index 0000000..43087b2 --- /dev/null +++ b/m4/ax_cxx_compile_stdcxx.m4 @@ -0,0 +1,951 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) +# +# DESCRIPTION +# +# Check for baseline language coverage in the compiler for the specified +# version of the C++ standard. If necessary, add switches to CXX and +# CXXCPP to enable support. VERSION may be '11' (for the C++11 standard) +# or '14' (for the C++14 standard). +# +# The second argument, if specified, indicates whether you insist on an +# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. +# -std=c++11). If neither is specified, you get whatever works, with +# preference for an extended mode. +# +# The third argument, if specified 'mandatory' or if left unspecified, +# indicates that baseline support for the specified C++ standard is +# required and that the macro should error out if no mode with that +# support is found. If specified 'optional', then configuration proceeds +# regardless, after defining HAVE_CXX${VERSION} if and only if a +# supporting mode is found. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# Copyright (c) 2012 Zack Weinberg +# Copyright (c) 2013 Roy Stogner +# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov +# Copyright (c) 2015 Paul Norman +# Copyright (c) 2015 Moritz Klammler +# Copyright (c) 2016, 2018 Krzesimir Nowak +# Copyright (c) 2019 Enji Cooper +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro +dnl (serial version number 13). + +AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl + m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"], + [$1], [14], [ax_cxx_compile_alternatives="14 1y"], + [$1], [17], [ax_cxx_compile_alternatives="17 1z"], + [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl + m4_if([$2], [], [], + [$2], [ext], [], + [$2], [noext], [], + [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl + m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true], + [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true], + [$3], [optional], [ax_cxx_compile_cxx$1_required=false], + [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])]) + AC_LANG_PUSH([C++])dnl + ac_success=no + + m4_if([$2], [noext], [], [dnl + if test x$ac_success = xno; then + for alternative in ${ax_cxx_compile_alternatives}; do + switch="-std=gnu++${alternative}" + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, + $cachevar, + [ac_save_CXX="$CXX" + CXX="$CXX $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXX="$ac_save_CXX"]) + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + fi]) + + m4_if([$2], [ext], [], [dnl + if test x$ac_success = xno; then + dnl HP's aCC needs +std=c++11 according to: + dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf + dnl Cray's crayCC needs "-h std=c++11" + for alternative in ${ax_cxx_compile_alternatives}; do + for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, + $cachevar, + [ac_save_CXX="$CXX" + CXX="$CXX $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXX="$ac_save_CXX"]) + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + if test x$ac_success = xyes; then + break + fi + done + fi]) + AC_LANG_POP([C++]) + if test x$ax_cxx_compile_cxx$1_required = xtrue; then + if test x$ac_success = xno; then + AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.]) + fi + fi + if test x$ac_success = xno; then + HAVE_CXX$1=0 + AC_MSG_NOTICE([No compiler with C++$1 support was found]) + else + HAVE_CXX$1=1 + AC_DEFINE(HAVE_CXX$1,1, + [define if the compiler supports basic C++$1 syntax]) + fi + AC_SUBST(HAVE_CXX$1) +]) + + +dnl Test body for checking C++11 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 +) + + +dnl Test body for checking C++14 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 +) + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 +) + +dnl Tests for new features in C++11 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[ + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual ~Base() {} + virtual void f() {} + }; + + struct Derived : public Base + { + virtual ~Derived() override {} + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + +]]) + + +dnl Tests for new features in C++14 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[ + +// If the compiler admits that it is not ready for C++14, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201402L + +#error "This is not a C++14 compiler" + +#else + +namespace cxx14 +{ + + namespace test_polymorphic_lambdas + { + + int + test() + { + const auto lambda = [](auto&&... args){ + const auto istiny = [](auto x){ + return (sizeof(x) == 1UL) ? 1 : 0; + }; + const int aretiny[] = { istiny(args)... }; + return aretiny[0]; + }; + return lambda(1, 1L, 1.0f, '1'); + } + + } + + namespace test_binary_literals + { + + constexpr auto ivii = 0b0000000000101010; + static_assert(ivii == 42, "wrong value"); + + } + + namespace test_generalized_constexpr + { + + template < typename CharT > + constexpr unsigned long + strlen_c(const CharT *const s) noexcept + { + auto length = 0UL; + for (auto p = s; *p; ++p) + ++length; + return length; + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("x") == 1UL, ""); + static_assert(strlen_c("test") == 4UL, ""); + static_assert(strlen_c("another\0test") == 7UL, ""); + + } + + namespace test_lambda_init_capture + { + + int + test() + { + auto x = 0; + const auto lambda1 = [a = x](int b){ return a + b; }; + const auto lambda2 = [a = lambda1(x)](){ return a; }; + return lambda2(); + } + + } + + namespace test_digit_separators + { + + constexpr auto ten_million = 100'000'000; + static_assert(ten_million == 100000000, ""); + + } + + namespace test_return_type_deduction + { + + auto f(int& x) { return x; } + decltype(auto) g(int& x) { return x; } + + template < typename T1, typename T2 > + struct is_same + { + static constexpr auto value = false; + }; + + template < typename T > + struct is_same + { + static constexpr auto value = true; + }; + + int + test() + { + auto x = 0; + static_assert(is_same::value, ""); + static_assert(is_same::value, ""); + return x; + } + + } + +} // namespace cxx14 + +#endif // __cplusplus >= 201402L + +]]) + + +dnl Tests for new features in C++17 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[ + +// If the compiler admits that it is not ready for C++17, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201703L + +#error "This is not a C++17 compiler" + +#else + +#include +#include +#include + +namespace cxx17 +{ + + namespace test_constexpr_lambdas + { + + constexpr int foo = [](){return 42;}(); + + } + + namespace test::nested_namespace::definitions + { + + } + + namespace test_fold_expression + { + + template + int multiply(Args... args) + { + return (args * ... * 1); + } + + template + bool all(Args... args) + { + return (args && ...); + } + + } + + namespace test_extended_static_assert + { + + static_assert (true); + + } + + namespace test_auto_brace_init_list + { + + auto foo = {5}; + auto bar {5}; + + static_assert(std::is_same, decltype(foo)>::value); + static_assert(std::is_same::value); + } + + namespace test_typename_in_template_template_parameter + { + + template typename X> struct D; + + } + + namespace test_fallthrough_nodiscard_maybe_unused_attributes + { + + int f1() + { + return 42; + } + + [[nodiscard]] int f2() + { + [[maybe_unused]] auto unused = f1(); + + switch (f1()) + { + case 17: + f1(); + [[fallthrough]]; + case 42: + f1(); + } + return f1(); + } + + } + + namespace test_extended_aggregate_initialization + { + + struct base1 + { + int b1, b2 = 42; + }; + + struct base2 + { + base2() { + b3 = 42; + } + int b3; + }; + + struct derived : base1, base2 + { + int d; + }; + + derived d1 {{1, 2}, {}, 4}; // full initialization + derived d2 {{}, {}, 4}; // value-initialized bases + + } + + namespace test_general_range_based_for_loop + { + + struct iter + { + int i; + + int& operator* () + { + return i; + } + + const int& operator* () const + { + return i; + } + + iter& operator++() + { + ++i; + return *this; + } + }; + + struct sentinel + { + int i; + }; + + bool operator== (const iter& i, const sentinel& s) + { + return i.i == s.i; + } + + bool operator!= (const iter& i, const sentinel& s) + { + return !(i == s); + } + + struct range + { + iter begin() const + { + return {0}; + } + + sentinel end() const + { + return {5}; + } + }; + + void f() + { + range r {}; + + for (auto i : r) + { + [[maybe_unused]] auto v = i; + } + } + + } + + namespace test_lambda_capture_asterisk_this_by_value + { + + struct t + { + int i; + int foo() + { + return [*this]() + { + return i; + }(); + } + }; + + } + + namespace test_enum_class_construction + { + + enum class byte : unsigned char + {}; + + byte foo {42}; + + } + + namespace test_constexpr_if + { + + template + int f () + { + if constexpr(cond) + { + return 13; + } + else + { + return 42; + } + } + + } + + namespace test_selection_statement_with_initializer + { + + int f() + { + return 13; + } + + int f2() + { + if (auto i = f(); i > 0) + { + return 3; + } + + switch (auto i = f(); i + 4) + { + case 17: + return 2; + + default: + return 1; + } + } + + } + + namespace test_template_argument_deduction_for_class_templates + { + + template + struct pair + { + pair (T1 p1, T2 p2) + : m1 {p1}, + m2 {p2} + {} + + T1 m1; + T2 m2; + }; + + void f() + { + [[maybe_unused]] auto p = pair{13, 42u}; + } + + } + + namespace test_non_type_auto_template_parameters + { + + template + struct B + {}; + + B<5> b1; + B<'a'> b2; + + } + + namespace test_structured_bindings + { + + int arr[2] = { 1, 2 }; + std::pair pr = { 1, 2 }; + + auto f1() -> int(&)[2] + { + return arr; + } + + auto f2() -> std::pair& + { + return pr; + } + + struct S + { + int x1 : 2; + volatile double y1; + }; + + S f3() + { + return {}; + } + + auto [ x1, y1 ] = f1(); + auto& [ xr1, yr1 ] = f1(); + auto [ x2, y2 ] = f2(); + auto& [ xr2, yr2 ] = f2(); + const auto [ x3, y3 ] = f3(); + + } + + namespace test_exception_spec_type_system + { + + struct Good {}; + struct Bad {}; + + void g1() noexcept; + void g2(); + + template + Bad + f(T*, T*); + + template + Good + f(T1*, T2*); + + static_assert (std::is_same_v); + + } + + namespace test_inline_variables + { + + template void f(T) + {} + + template inline T g(T) + { + return T{}; + } + + template<> inline void f<>(int) + {} + + template<> int g<>(int) + { + return 5; + } + + } + +} // namespace cxx17 + +#endif // __cplusplus < 201703L + +]]) diff --git a/tests/Makefile.am b/tests/Makefile.am index 4104a4e..94f2cf0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,25 +14,60 @@ TAP_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \ RSEQ_TESTS_BUILDDIR='$(abs_top_builddir)/tests' \ $(SHELL) $(srcdir)/utils/tap-driver.sh -noinst_PROGRAMS = basic_percpu_ops_test.tap basic_test.tap param_test \ - param_test_benchmark param_test_compare_twice -dist_noinst_SCRIPTS = run_param_test.tap +noinst_PROGRAMS = \ + basic_percpu_ops_test.tap \ + basic_percpu_ops_test_cxx.tap \ + basic_test.tap \ + basic_test_cxx.tap \ + param_test \ + param_test_cxx \ + param_test_benchmark \ + param_test_benchmark_cxx \ + param_test_compare_twice \ + param_test_compare_twice_cxx + +dist_noinst_SCRIPTS = \ + run_param_test.tap \ + run_param_test_cxx.tap basic_percpu_ops_test_tap_SOURCES = basic_percpu_ops_test.c basic_percpu_ops_test_tap_LDADD = $(top_builddir)/src/librseq.la $(top_builddir)/tests/utils/libtap.la $(DL_LIBS) +basic_percpu_ops_test_cxx_tap_SOURCES = basic_percpu_ops_test_cxx.cpp +basic_percpu_ops_test_cxx_tap_LDADD = $(top_builddir)/src/librseq.la $(top_builddir)/tests/utils/libtap.la $(DL_LIBS) + basic_test_tap_SOURCES = basic_test.c basic_test_tap_LDADD = $(top_builddir)/src/librseq.la $(top_builddir)/tests/utils/libtap.la $(DL_LIBS) +basic_test_cxx_tap_SOURCES = basic_test_cxx.cpp +basic_test_cxx_tap_LDADD = $(top_builddir)/src/librseq.la $(top_builddir)/tests/utils/libtap.la $(DL_LIBS) + param_test_SOURCES = param_test.c param_test_LDADD = $(top_builddir)/src/librseq.la $(DL_LIBS) +param_test_cxx_SOURCES = param_test_cxx.cpp +param_test_cxx_LDADD = $(top_builddir)/src/librseq.la $(DL_LIBS) + param_test_benchmark_SOURCES = param_test.c param_test_benchmark_CPPFLAGS = $(AM_CPPFLAGS) -DBENCHMARK param_test_benchmark_LDADD = $(top_builddir)/src/librseq.la $(DL_LIBS) +param_test_benchmark_cxx_SOURCES = param_test_cxx.cpp +param_test_benchmark_cxx_CPPFLAGS = $(AM_CPPFLAGS) -DBENCHMARK +param_test_benchmark_cxx_LDADD = $(top_builddir)/src/librseq.la $(DL_LIBS) + param_test_compare_twice_SOURCES = param_test.c param_test_compare_twice_CPPFLAGS = $(AM_CPPFLAGS) -DRSEQ_COMPARE_TWICE param_test_compare_twice_LDADD = $(top_builddir)/src/librseq.la $(DL_LIBS) -TESTS = basic_percpu_ops_test.tap basic_test.tap run_param_test.tap +param_test_compare_twice_cxx_SOURCES = param_test_cxx.cpp +param_test_compare_twice_cxx_CPPFLAGS = $(AM_CPPFLAGS) -DRSEQ_COMPARE_TWICE +param_test_compare_twice_cxx_LDADD = $(top_builddir)/src/librseq.la $(DL_LIBS) + +TESTS = \ + basic_percpu_ops_test.tap \ + basic_percpu_ops_test_cxx.tap \ + basic_test.tap \ + basic_test_cxx.tap \ + run_param_test.tap \ + run_param_test_cxx.tap diff --git a/tests/basic_percpu_ops_test.c b/tests/basic_percpu_ops_test.c index e514ce6..8628862 100644 --- a/tests/basic_percpu_ops_test.c +++ b/tests/basic_percpu_ops_test.c @@ -85,7 +85,7 @@ void rseq_percpu_unlock(struct percpu_lock *lock, int cpu) void *test_percpu_spinlock_thread(void *arg) { - struct spinlock_test_data *data = arg; + struct spinlock_test_data *data = (struct spinlock_test_data *) arg; int i, cpu; if (rseq_register_current_thread()) { @@ -264,7 +264,7 @@ void test_percpu_list(void) expected_sum += j; - node = malloc(sizeof(*node)); + node = (struct percpu_list_node *) malloc(sizeof(*node)); assert(node); node->data = j; node->next = list.c[i].head; diff --git a/tests/basic_percpu_ops_test_cxx.cpp b/tests/basic_percpu_ops_test_cxx.cpp new file mode 100644 index 0000000..240e674 --- /dev/null +++ b/tests/basic_percpu_ops_test_cxx.cpp @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: LGPL-2.1-only */ + +#include "basic_percpu_ops_test.c" diff --git a/tests/basic_test_cxx.cpp b/tests/basic_test_cxx.cpp new file mode 100644 index 0000000..94432c1 --- /dev/null +++ b/tests/basic_test_cxx.cpp @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: LGPL-2.1-only */ + +#include "basic_test.c" diff --git a/tests/param_test.c b/tests/param_test.c index eeb4c06..b423767 100644 --- a/tests/param_test.c +++ b/tests/param_test.c @@ -359,7 +359,7 @@ static void rseq_percpu_unlock(struct percpu_lock *lock, int cpu) void *test_percpu_spinlock_thread(void *arg) { - struct spinlock_thread_test_data *thread_data = arg; + struct spinlock_thread_test_data *thread_data = (struct spinlock_thread_test_data *) arg; struct spinlock_test_data *data = thread_data->data; long long i, reps; @@ -438,7 +438,7 @@ void test_percpu_spinlock(void) void *test_percpu_inc_thread(void *arg) { - struct inc_thread_test_data *thread_data = arg; + struct inc_thread_test_data *thread_data = (struct inc_thread_test_data *) arg; struct inc_test_data *data = thread_data->data; long long i, reps; @@ -638,7 +638,7 @@ void test_percpu_list(void) expected_sum += j; - node = malloc(sizeof(*node)); + node = (struct percpu_list_node *) malloc(sizeof(*node)); assert(node); node->data = j; node->next = list.c[i].head; @@ -826,6 +826,7 @@ void test_percpu_buffer(void) continue; /* Worse-case is every item in same CPU. */ buffer.c[i].array = + (struct percpu_buffer_node **) malloc(sizeof(*buffer.c[i].array) * CPU_SETSIZE * BUFFER_ITEM_PER_CPU); assert(buffer.c[i].array); @@ -842,7 +843,7 @@ void test_percpu_buffer(void) * within a single word, so allocate an object * for each node. */ - node = malloc(sizeof(*node)); + node = (struct percpu_buffer_node *) malloc(sizeof(*node)); assert(node); node->data = j; buffer.c[i].array[j - 1] = node; @@ -1041,6 +1042,7 @@ void test_percpu_memcpy_buffer(void) continue; /* Worse-case is every item in same CPU. */ buffer.c[i].array = + (struct percpu_memcpy_buffer_node *) malloc(sizeof(*buffer.c[i].array) * CPU_SETSIZE * MEMCPY_BUFFER_ITEM_PER_CPU); assert(buffer.c[i].array); diff --git a/tests/param_test_cxx.cpp b/tests/param_test_cxx.cpp new file mode 100644 index 0000000..70abdef --- /dev/null +++ b/tests/param_test_cxx.cpp @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: LGPL-2.1-only */ + +#include "param_test.c" diff --git a/tests/run_param_test_cxx.tap b/tests/run_param_test_cxx.tap new file mode 100755 index 0000000..c61906f --- /dev/null +++ b/tests/run_param_test_cxx.tap @@ -0,0 +1,112 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0+ or MIT + +SH_TAP=1 + +if [ "x${RSEQ_TESTS_SRCDIR:-}" != "x" ]; then + UTILSSH="$RSEQ_TESTS_SRCDIR/utils/utils.sh" +else + UTILSSH="$(dirname "$0")/utils/utils.sh" +fi + +# shellcheck source=./utils/utils.sh +source "$UTILSSH" + + +EXTRA_ARGS=("${@}") + +REPS=1000 +NR_CPUS=$(nproc) +NR_THREADS=$((6 * NR_CPUS)) + + +function do_test() +{ + local test_name=$1 + shift + local args=("$@") + + "$RSEQ_TESTS_BUILDDIR"/param_test_cxx "${args[@]}" -r ${REPS} -t ${NR_THREADS} "${EXTRA_ARGS[@]}" + ok $? "Running test ${test_name}" + + "$RSEQ_TESTS_BUILDDIR"/param_test_compare_twice_cxx "${args[@]}" -r ${REPS} -t ${NR_THREADS} "${EXTRA_ARGS[@]}" + ok $? "Running compare-twice test ${test_name}" +} + +function do_tests() +{ + local args=("$@") + + do_test "spinlock" -T s "${@}" + do_test "list" -T l "${@}" + do_test "buffer" -T b "${@}" + do_test "buffer with barrier" -T b -M "${@}" + do_test "memcpy" -T m "${@}" + do_test "memcpy with barrier" -T m -M "${@}" + do_test "increment" -T i "${@}" +} + +function do_tests_loops() +{ + local nr_loops="$1" + + do_tests -1 "${nr_loops}" + do_tests -2 "${nr_loops}" + do_tests -3 "${nr_loops}" + do_tests -4 "${nr_loops}" + do_tests -5 "${nr_loops}" + do_tests -6 "${nr_loops}" + do_tests -7 "${nr_loops}" + do_tests -8 "${nr_loops}" + do_tests -9 "${nr_loops}" +} + +function do_tests_inject() +{ + local args=("$@") + + do_tests -7 -1 "${@}" + do_tests -8 -1 "${@}" + do_tests -9 -1 "${@}" +} + + +"$RSEQ_TESTS_BUILDDIR"/param_test -c +if [[ $? == 2 ]]; then + plan_skip_all "The rseq syscall is unavailable" +else + plan_tests $(( 2 * 7 * 37 )) +fi + +diag "Default parameters" +do_tests + +diag "Loop injection: 10000 loops" +do_tests_loops 10000 + +diag "Yield injection (25%)" +do_tests_inject -m 4 -y + +diag "Yield injection (50%)" +do_tests_inject -m 2 -y + +diag "Yield injection (100%)" +do_tests_inject -m 1 -y + +diag "Kill injection (25%)" +do_tests_inject -m 4 -k + +diag "Kill injection (50%)" +do_tests_inject -m 2 -k + +diag "Kill injection (100%)" +do_tests_inject -m 1 -k + +diag "Sleep injection (1ms, 25%)" +do_tests_inject -m 4 -s 1 + +diag "Sleep injection (1ms, 50%)" +do_tests_inject -m 2 -s 1 + +diag "Sleep injection (1ms, 100%)" +do_tests_inject -m 1 -s 1 diff --git a/tests/utils/tap.h b/tests/utils/tap.h index b3e9445..76e7023 100644 --- a/tests/utils/tap.h +++ b/tests/utils/tap.h @@ -5,6 +5,10 @@ * Copyright (C) 2017 Jérémie Galarneau */ +#ifdef __cplusplus +extern "C" { +#endif + /* '## __VA_ARGS__' is a gcc'ism. C99 doesn't allow the token pasting and requires the caller to add the final comma if they've ommitted the optional arguments */ @@ -80,3 +84,7 @@ void todo_start(const char *, ...); void todo_end(void); int exit_status(void); + +#ifdef __cplusplus +} +#endif -- 2.34.1