February 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Build the PWL unless not explicitly disabled at configuration time.
by Roberto Bagnara 17 Feb '10

17 Feb '10

Module: ppl/ppl Branch: master Commit: f0cd7dc9899fc7dac2580a97da69e6282bfc0576 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f0cd7dc9899f… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Feb 17 11:55:16 2010 +0100 Build the PWL unless not explicitly disabled at configuration time. --- Watchdog/configure.ac | 21 +++++++-------------- configure.ac | 16 ++-------------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/Watchdog/configure.ac b/Watchdog/configure.ac index b0d2f4b..d4e2b86 100644 --- a/Watchdog/configure.ac +++ b/Watchdog/configure.ac @@ -332,26 +332,14 @@ no) esac AM_CONDITIONAL(VALGRIND_TESTS_ENABLED, test x"$enable_valgrind_tests" = xyes) -# setitimer() is a strong requisite for the PWL. -AC_CHECK_FUNCS([setitimer], [have_setitimer=yes], [have_setitimer=no]) - -enableval=default +enableval=yes AC_MSG_CHECKING([whether to build the Parma Watchdog Library]) AC_ARG_ENABLE(watchdog, AS_HELP_STRING([--enable-watchdog], [build also the Parma Watchdog Library])) case "${enableval}" in yes) - if test x"$have_setitimer" = xyes - then - build_watchdog_library=yes - else - AC_MSG_ERROR([CANNOT BUILD THE WATCHDOG LIBRARY -*** THE SYSTEM DOES NOT PROVIDE THE SETITIMER FUNCTION.]) - fi - ;; -default) - build_watchdog_library=$have_setitimer + build_watchdog_library=yes ;; no) build_watchdog_library=no @@ -371,6 +359,11 @@ then # Checks for the availability of C library functions in C++. AC_CHECK_DECLS([getenv], , , [#include <cstdlib>]) + AC_CHECK_DECLS([setitimer], [], [], [[ +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif + ]]) AC_CHECK_DECLS([sigaction], , , [#include <csignal>]) # Checks for typedefs, structures, and compiler characteristics. diff --git a/configure.ac b/configure.ac index d67f0ff..13fc9e8 100644 --- a/configure.ac +++ b/configure.ac @@ -762,26 +762,14 @@ fi extra_includes="${extra_includes}${extra_includes:+ }${gmp_includes_option}" extra_libraries="${extra_libraries}${extra_libraries:+ }${gmp_library_option}" -# setitimer() is a strong requisite for the PWL. -AC_CHECK_FUNCS([setitimer], [have_setitimer=yes], [have_setitimer=no]) - -enableval=default +enableval=yes AC_MSG_CHECKING([whether to build the Parma Watchdog Library]) AC_ARG_ENABLE(watchdog, AS_HELP_STRING([--enable-watchdog], [build also the Parma Watchdog Library])) case "${enableval}" in yes) - if test x"$have_setitimer" = xyes - then - build_watchdog_library=yes - else - AC_MSG_ERROR([CANNOT BUILD THE WATCHDOG LIBRARY -*** THE SYSTEM DOES NOT PROVIDE THE SETITIMER FUNCTION.]) - fi - ;; -default) - build_watchdog_library=$have_setitimer + build_watchdog_library=yes ;; no) build_watchdog_library=no

1 0

[GIT] ppl/ppl(floating_point): Merge branch 'floating_point' of ssh://git. cs.unipr.it/git/ppl/ppl into floating_point
by Fabio 17 Feb '10

17 Feb '10

Module: ppl/ppl Branch: floating_point Commit: 01e3978bbebd69d01c006ac36404c5a344cd71ab URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=01e3978bbebd… Author: Fabio <Fabio(a)C1P4.(none)> Date: Wed Feb 17 10:25:20 2010 +0100 Merge branch 'floating_point' of ssh://git.cs.unipr.it/git/ppl/ppl into floating_point ---

1 0

[GIT] ppl/ppl(floating_point): Fixed a type error.
by Fabio 17 Feb '10

17 Feb '10

Module: ppl/ppl Branch: floating_point Commit: 3f6a0a0624328d63cdef17da7e06a8bd31e1f93e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3f6a0a062432… Author: Fabio <Fabio(a)C1P4.(none)> Date: Wed Feb 17 10:01:15 2010 +0100 Fixed a type error. --- src/Float.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Float.inlines.hh b/src/Float.inlines.hh index 2193353..946a1cf 100644 --- a/src/Float.inlines.hh +++ b/src/Float.inlines.hh @@ -82,7 +82,7 @@ float_ieee754_half::build(bool negative, mpz_t mantissa, int exponent) { word = mpz_get_ui(mantissa) & ((1UL << MANTISSA_BITS) - 1); if (negative) word |= SGN_MASK; - word |= static_cast<uint32_t>(exponent + EXPONENT_BIAS) << MANTISSA_BITS; + word |= static_cast<uint16_t>(exponent + EXPONENT_BIAS) << MANTISSA_BITS; } inline int

1 0

[GIT] ppl/ppl(master): Variable shadowing avoided. Scope of variables reduced. One FIXME added.
by Roberto Bagnara 17 Feb '10

17 Feb '10

Module: ppl/ppl Branch: master Commit: 3c3188f08c10a1914cd545f35ba10a6ee464c3b9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3c3188f08c10… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Feb 17 10:16:43 2010 +0100 Variable shadowing avoided. Scope of variables reduced. One FIXME added. --- demos/ppl_pips/ppl_pips.cc | 48 ++++++++++++++++++++++++++----------------- src/Grid_public.cc | 4 +- src/wrap_assign.hh | 22 ++++++++++---------- 3 files changed, 42 insertions(+), 32 deletions(-) diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc index 378a65b..edb60da 100644 --- a/demos/ppl_pips/ppl_pips.cc +++ b/demos/ppl_pips/ppl_pips.cc @@ -124,10 +124,13 @@ pip_display_sol(std::ostream& out, using namespace Parma_Polyhedra_Library::IO_Operators; if (!pip) { out << setw(indent*2) << "" << "_|_" << endl; - } else { - PIP_Tree_Node::Artificial_Parameter_Sequence::const_iterator i, i_end; - i_end = pip->art_parameter_end(); - for (i = pip->art_parameter_begin(); i != i_end; ++i) { + } + else { + for (PIP_Tree_Node::Artificial_Parameter_Sequence::const_iterator + i = pip->art_parameter_begin(), + i_end = pip->art_parameter_end(); + i != i_end; + ++i) { out << setw(indent*2) << "" << "Parameter " << Linear_Expression(Variable(space_dimension++)) << " = " << *i << endl; @@ -137,10 +140,10 @@ pip_display_sol(std::ostream& out, if (!constraints_empty) { out << setw(indent*2) << "" << "if "; for (Constraint_System::const_iterator - begin = constraints.begin(), - end = constraints.end(), - i = begin; i != end; ++i) - out << ((i == begin) ? "" : " and ") << *i; + cs_begin = constraints.begin(), + cs_end = constraints.end(), + i = cs_begin; i != cs_end; ++i) + out << ((i == cs_begin) ? "" : " and ") << *i; out << " then" << endl; } const PIP_Decision_Node* dn = pip->as_decision(); @@ -154,10 +157,10 @@ pip_display_sol(std::ostream& out, const PIP_Solution_Node* sn = pip->as_solution(); out << setw(indent*2 + (constraints_empty ? 0 : 2)) << "" << "{"; for (Variables_Set::const_iterator - begin = vars.begin(), - end = vars.end(), - i = begin; i != end; ++i) - out << ((i == begin) ? "" : " ; ") + v_begin = vars.begin(), + v_end = vars.end(), + i = v_begin; i != v_end; ++i) + out << ((i == v_begin) ? "" : " ; ") << sn->parametric_values(Variable(*i), parameters); out << "}" << endl; if (!constraints_empty) { @@ -265,8 +268,10 @@ public: PPL::dimension_type constraint_width; std::string line; getline_nocomment(in, line); - std::istringstream sin(line); - sin >> num_ctx_rows >> num_params; + { + std::istringstream sin(line); + sin >> num_ctx_rows >> num_params; + } num_params -= 2; PPL::Coefficient context[num_ctx_rows][num_params+1]; int ctx_type[num_ctx_rows]; @@ -279,14 +284,19 @@ public: sin >> context[i][j]; } } - getline_nocomment(in, line); - std::istringstream sin2(line); + // FIXME: can this variable be given a better name? int tmp; - sin2 >> tmp; + getline_nocomment(in, line); + { + std::istringstream sin(line); + sin >> tmp; + } getline_nocomment(in, line); - std::istringstream sin3(line); - sin3 >> num_constraints >> constraint_width; + { + std::istringstream sin(line); + sin >> num_constraints >> constraint_width; + } constraint_width -= 1; num_vars = constraint_width - num_params - 1; PPL::Coefficient constraints[num_constraints][constraint_width]; diff --git a/src/Grid_public.cc b/src/Grid_public.cc index 36b9926..0b30a9e 100644 --- a/src/Grid_public.cc +++ b/src/Grid_public.cc @@ -1611,8 +1611,8 @@ PPL::Grid::simplify_using_context_assign(const Grid& y) { gr.refine_no_check(le == 1); else { Linear_Expression le2; - for (dimension_type i = le.space_dimension(); i-- > 0; ) - le2 += 2 * le.coefficient(Variable(i)) * Variable(i); + for (dimension_type j = le.space_dimension(); j-- > 0; ) + le2 += 2 * le.coefficient(Variable(j)) * Variable(j); le2 += 2 * le.inhomogeneous_term(); gr.refine_no_check(le2 == y_modulus_i); } diff --git a/src/wrap_assign.hh b/src/wrap_assign.hh index 9e55948..fec4ac1 100644 --- a/src/wrap_assign.hh +++ b/src/wrap_assign.hh @@ -312,24 +312,24 @@ wrap_assign(PSET& pointset, quadrants = last_quadrant - first_quadrant + 1; unsigned extension; - Result r = assign_r(extension, quadrants, ROUND_IGNORE); - if (result_overflow(r) || extension > complexity_threshold) + Result res = assign_r(extension, quadrants, ROUND_IGNORE); + if (result_overflow(res) || extension > complexity_threshold) goto set_full_range; if (!wrap_individually && !collective_wrap_too_complex) { - r = mul_assign_r(collective_wrap_complexity, - collective_wrap_complexity, extension, ROUND_IGNORE); - if (result_overflow(r) + res = mul_assign_r(collective_wrap_complexity, + collective_wrap_complexity, extension, ROUND_IGNORE); + if (result_overflow(res) || collective_wrap_complexity > complexity_threshold) collective_wrap_too_complex = true; if (collective_wrap_too_complex) { // Set all the dimensions in `translations' to full range. - for (Wrap_Translations::const_iterator i = translations.begin(), - tend = translations.end(); i != tend; ++i) { - const Variable& x = i->var; - pointset.unconstrain(x); - full_range_bounds.insert(min_value <= x); - full_range_bounds.insert(x <= max_value); + for (Wrap_Translations::const_iterator j = translations.begin(), + tend = translations.end(); j != tend; ++j) { + const Variable& y = j->var; + pointset.unconstrain(y); + full_range_bounds.insert(min_value <= y); + full_range_bounds.insert(y <= max_value); } } }

1 0

[GIT] ppl/ppl(master): Tests 2, 5, 7, 8, 9 and 10 do not overflow on 16 bit coefficients.
by Enea Zaffanella 17 Feb '10

17 Feb '10

Module: ppl/ppl Branch: master Commit: e9f9532b48874bdd02cac2f88fe241629bfd0e04 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e9f9532b4887… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 17 10:06:30 2010 +0100 Tests 2, 5, 7, 8, 9 and 10 do not overflow on 16 bit coefficients. --- tests/PIP_Problem/pipproblem1.cc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/PIP_Problem/pipproblem1.cc b/tests/PIP_Problem/pipproblem1.cc index ff305ca..6a1582d 100644 --- a/tests/PIP_Problem/pipproblem1.cc +++ b/tests/PIP_Problem/pipproblem1.cc @@ -383,13 +383,13 @@ test10() { BEGIN_MAIN DO_TEST(test01); - DO_TEST_F16(test02); + DO_TEST_F8(test02); DO_TEST(test03); DO_TEST(test04); - DO_TEST_F16(test05); + DO_TEST_F8(test05); DO_TEST(test06); - DO_TEST_F16(test07); - DO_TEST_F16(test08); - DO_TEST_F16(test09); - DO_TEST_F16(test10); + DO_TEST_F8(test07); + DO_TEST_F8(test08); + DO_TEST_F8(test09); + DO_TEST_F8(test10); END_MAIN

1 0

[GIT] ppl/ppl(master): Solved other instances of test02, but using different cutting strategies.
by Enea Zaffanella 16 Feb '10

16 Feb '10

Module: ppl/ppl Branch: master Commit: d3339d25083d4cdac4a565d5aea95cf70772cc4f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d3339d25083d… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Feb 16 23:15:46 2010 +0100 Solved other instances of test02, but using different cutting strategies. --- tests/PIP_Problem/pipproblem1.cc | 62 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/tests/PIP_Problem/pipproblem1.cc b/tests/PIP_Problem/pipproblem1.cc index be8ac12..ff305ca 100644 --- a/tests/PIP_Problem/pipproblem1.cc +++ b/tests/PIP_Problem/pipproblem1.cc @@ -319,6 +319,66 @@ test08() { return ok; } +bool +test09() { + // Same problem as test02, but using CUTTING_STRATEGY_DEEPEST. + Variable i(0); + Variable j(1); + Variable n(2); + Variable m(3); + Variables_Set params(n, m); + + Constraint_System cs; + cs.insert(3*j >= -2*i+8); + cs.insert(j <= 4*i - 4); + cs.insert(j <= m); + //cs.insert(j >= 0); + cs.insert(i <= n); + + PIP_Problem pip(cs.space_dimension(), cs.begin(), cs.end(), params); + pip.set_control_parameter(PIP_Problem::CUTTING_STRATEGY_DEEPEST); + + bool ok = (pip.solve() == OPTIMIZED_PIP_PROBLEM); + if (ok) { + const PIP_Tree solution = pip.solution(); + ok &= solution->OK(); + display_solution(solution, params, Variables_Set(i, j), + cs.space_dimension()); + } + + return ok; +} + +bool +test10() { + // Same problem as test02, but using CUTTING_STRATEGY_ALL. + Variable i(0); + Variable j(1); + Variable n(2); + Variable m(3); + Variables_Set params(n, m); + + Constraint_System cs; + cs.insert(3*j >= -2*i+8); + cs.insert(j <= 4*i - 4); + cs.insert(j <= m); + //cs.insert(j >= 0); + cs.insert(i <= n); + + PIP_Problem pip(cs.space_dimension(), cs.begin(), cs.end(), params); + pip.set_control_parameter(PIP_Problem::CUTTING_STRATEGY_ALL); + + bool ok = (pip.solve() == OPTIMIZED_PIP_PROBLEM); + if (ok) { + const PIP_Tree solution = pip.solution(); + ok &= solution->OK(); + display_solution(solution, params, Variables_Set(i, j), + cs.space_dimension()); + } + + return ok; +} + } // namespace BEGIN_MAIN @@ -330,4 +390,6 @@ BEGIN_MAIN DO_TEST(test06); DO_TEST_F16(test07); DO_TEST_F16(test08); + DO_TEST_F16(test09); + DO_TEST_F16(test10); END_MAIN

1 0

[GIT] ppl/ppl(master): Fixed bug introduced when improving coding style in PIP_Solution_Node:: solve.
by Enea Zaffanella 16 Feb '10

16 Feb '10

Module: ppl/ppl Branch: master Commit: 53e86bccd511369b2fa500d60b355ebee824fc2b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=53e86bccd511… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Feb 16 22:40:01 2010 +0100 Fixed bug introduced when improving coding style in PIP_Solution_Node::solve. Corrected wrong assertion in PIP_Solution_Node::generate_cut. --- src/PIP_Tree.cc | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index e92664f..60b8fbf 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1788,18 +1788,26 @@ PIP_Solution_Node::solve(const PIP_Problem& problem, PPL_DIRTY_TEMP_COEFFICIENT(gcd); PPL_DIRTY_TEMP_COEFFICIENT(scale_factor); - // Create identity rows corresponding to basic variable pj. + // Creating identity rows corresponding to basic variable pj: + // 1. add them to tableau so as to have proper size and capacity; tableau.s.add_zero_rows(1, Row::Flags()); tableau.t.add_zero_rows(1, Row::Flags()); - Row& s_pivot = tableau.s[num_rows]; - Row& t_pivot = tableau.t[num_rows]; + // 2. swap the rows just added with empty ones. + Row s_pivot(0, Row::Flags()); + Row t_pivot(0, Row::Flags()); + s_pivot.swap(tableau.s[num_rows]); + t_pivot.swap(tableau.t[num_rows]); + // 3. drop rows previously added at end of tableau. + tableau.s.erase_to_end(num_rows); + tableau.t.erase_to_end(num_rows); + // Save current pivot denominator. PPL_DIRTY_TEMP_COEFFICIENT(pivot_den); pivot_den = tableau.get_denominator(); // Let the (scaled) pivot coordinate be 1. s_pivot[pj] = pivot_den; - // Swap identity row with the pivot row previosuly found. + // Swap identity row with the pivot row previously found. s_pivot.swap(tableau.s[pi]); t_pivot.swap(tableau.t[pi]); sign[pi] = ZERO; @@ -1897,10 +1905,6 @@ PIP_Solution_Node::solve(const PIP_Problem& problem, } } - // Drop rows previously added at end of tableau. - tableau.s.erase_to_end(num_rows); - tableau.t.erase_to_end(num_rows); - // Pivoting process ended: jump to next iteration. solution_valid = false; continue; @@ -2211,7 +2215,7 @@ PIP_Solution_Node::generate_cut(const dimension_type index, PPL_ASSERT(index < num_rows); const dimension_type num_vars = tableau.s.num_columns(); const dimension_type num_params = tableau.t.num_columns(); - PPL_ASSERT(num_params == parameters.size()); + PPL_ASSERT(num_params == 1 + parameters.size()); const Coefficient& den = tableau.get_denominator(); PPL_DIRTY_TEMP_COEFFICIENT(mod);

1 0

[GIT] ppl/ppl(master): Important item added.
by Roberto Bagnara 16 Feb '10

16 Feb '10

Module: ppl/ppl Branch: master Commit: 214df020741ef3cbffb31971e99086f0fbc88d94 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=214df020741e… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Feb 16 21:43:32 2010 +0100 Important item added. --- TODO | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/TODO b/TODO index 835ea2c..8c3cf6d 100644 --- a/TODO +++ b/TODO @@ -2,6 +2,10 @@ Enhancements for PPL 0.11 ========================= +- Deterministic timeouts are disabled whenever the PWL is disabled. + However, the PWL is disabled when OS support for dealing with + real and CPU time are unavailable, which is not relevant for + people that want to use deterministic timeouts. - Make all the *affine*image() methods uniform as far as the specification is concerned. - Look carefully at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42115

1 0

[GIT] ppl/ppl(master): Unwanted inclusion removed.
by Roberto Bagnara 16 Feb '10

16 Feb '10

Module: ppl/ppl Branch: master Commit: 9391a5768d5e90217d3b6c58ab0dd0496287afaf URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9391a5768d5e… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Feb 16 21:39:51 2010 +0100 Unwanted inclusion removed. --- interfaces/C/ppl_c_implementation_common.cc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/interfaces/C/ppl_c_implementation_common.cc b/interfaces/C/ppl_c_implementation_common.cc index 92bf0a6..d6ad365 100644 --- a/interfaces/C/ppl_c_implementation_common.cc +++ b/interfaces/C/ppl_c_implementation_common.cc @@ -23,7 +23,6 @@ site: http://www.cs.unipr.it/ppl/ . */ /* Interface for Coefficient. */ #include "ppl_c_implementation_common.defs.hh" -#include "compiler.hh" namespace Parma_Polyhedra_Library {

1 0

[GIT] ppl/ppl(master): Use the right preprocessor conditionals for PPL_HAVE_DECL_SIGACTION.
by Roberto Bagnara 16 Feb '10

16 Feb '10

Module: ppl/ppl Branch: master Commit: 9ba82c5fb51ff9f63818fa8c6f006a1900a70894 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9ba82c5fb51f… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Feb 16 21:35:54 2010 +0100 Use the right preprocessor conditionals for PPL_HAVE_DECL_SIGACTION. --- Watchdog/tests/pwl_test.cc | 8 ++++---- tests/ppl_test.cc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Watchdog/tests/pwl_test.cc b/Watchdog/tests/pwl_test.cc index 4100e5b..94d4c3b 100644 --- a/Watchdog/tests/pwl_test.cc +++ b/Watchdog/tests/pwl_test.cc @@ -43,7 +43,7 @@ uncaught_exception_handler() { exit(1); } -#ifdef PWL_HAVE_DECL_SIGACTION +#if PWL_HAVE_DECL_SIGACTION #if defined(PWL_HAVE_SIGINFO_T) && defined(SA_SIGINFO) @@ -157,7 +157,7 @@ fpe_handler(int sig) { #endif // !defined(PWL_HAVE_SIGINFO_T) || !defined(SA_SIGINFO) -#endif // defined(PWL_HAVE_DECL_SIGACTION) +#endif // PWL_HAVE_DECL_SIGACTION } // namespace @@ -167,7 +167,7 @@ namespace Test { void set_handlers() { -#ifdef PWL_HAVE_DECL_SIGACTION +#if PWL_HAVE_DECL_SIGACTION struct sigaction action; sigemptyset(&action.sa_mask); #if defined(PWL_HAVE_SIGINFO_T) && defined(SA_SIGINFO) @@ -182,7 +182,7 @@ set_handlers() { << std::endl; abort(); } -#endif // defined(PWL_HAVE_DECL_SIGACTION) +#endif // PWL_HAVE_DECL_SIGACTION std::set_unexpected(unexpected_exception_handler); std::set_terminate(uncaught_exception_handler); diff --git a/tests/ppl_test.cc b/tests/ppl_test.cc index 9ec9f23..df44e71 100644 --- a/tests/ppl_test.cc +++ b/tests/ppl_test.cc @@ -43,7 +43,7 @@ uncaught_exception_handler() { exit(1); } -#ifdef PPL_HAVE_DECL_SIGACTION +#if PPL_HAVE_DECL_SIGACTION #if defined(PPL_HAVE_SIGINFO_T) && defined(SA_SIGINFO) @@ -157,7 +157,7 @@ fpe_handler(int sig) { #endif // !defined(PPL_HAVE_SIGINFO_T) || !defined(SA_SIGINFO) -#endif // defined(PPL_HAVE_DECL_SIGACTION) +#endif // PPL_HAVE_DECL_SIGACTION } // namespace @@ -167,7 +167,7 @@ namespace Test { void set_handlers() { -#ifdef PPL_HAVE_DECL_SIGACTION +#if PPL_HAVE_DECL_SIGACTION struct sigaction action; sigemptyset(&action.sa_mask); #if defined(PPL_HAVE_SIGINFO_T) && defined(SA_SIGINFO) @@ -182,7 +182,7 @@ set_handlers() { << std::endl; abort(); } -#endif // defined(PPL_HAVE_DECL_SIGACTION) +#endif // PPL_HAVE_DECL_SIGACTION std::set_unexpected(unexpected_exception_handler); std::set_terminate(uncaught_exception_handler);

1 0