February 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Test program renamed.
by Roberto Bagnara 17 Feb '10

17 Feb '10

Module: ppl/ppl Branch: master Commit: b492ed70728e112aaafabe79d1e91cd40fc383eb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b492ed70728e… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Feb 17 15:39:01 2010 +0100 Test program renamed. --- Watchdog/tests/Makefile.am | 4 ++-- Watchdog/tests/{simple1.cc => watchdog1.cc} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Watchdog/tests/Makefile.am b/Watchdog/tests/Makefile.am index 04bbdca..05fd8b2 100644 --- a/Watchdog/tests/Makefile.am +++ b/Watchdog/tests/Makefile.am @@ -55,7 +55,7 @@ pwl_test.hh EXTRA_DIST = valgrind_suppressions TESTS = \ -simple1 +watchdog1 XFAIL_TESTS = @@ -63,7 +63,7 @@ XFAIL_TESTS = # Sources for the tests # -simple1_SOURCES = simple1.cc +watchdog1_SOURCES = watchdog1.cc check_PROGRAMS = $(TESTS) diff --git a/Watchdog/tests/simple1.cc b/Watchdog/tests/watchdog1.cc similarity index 100% rename from Watchdog/tests/simple1.cc rename to Watchdog/tests/watchdog1.cc

1 0

[GIT] ppl/ppl(master): Cosmetic changes.
by Roberto Bagnara 17 Feb '10

17 Feb '10

Module: ppl/ppl Branch: master Commit: 8d8d4194c8e1e85641fb5dfe10ec14346c48862d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8d8d4194c8e1… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Feb 17 15:37:50 2010 +0100 Cosmetic changes. --- tests/Polyhedron/watchdog1.cc | 2 +- tests/Polyhedron/weightwatch1.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Polyhedron/watchdog1.cc b/tests/Polyhedron/watchdog1.cc index 4e1413b..0548f52 100644 --- a/tests/Polyhedron/watchdog1.cc +++ b/tests/Polyhedron/watchdog1.cc @@ -41,7 +41,7 @@ class Timeout : virtual public std::exception, public Parma_Polyhedra_Library::Throwable { public: const char* what() const throw() { - return "Timeout in watchdog1.cc"; + return "timeout in watchdog1.cc"; } void throw_me() const { diff --git a/tests/Polyhedron/weightwatch1.cc b/tests/Polyhedron/weightwatch1.cc index 3ccc030..2b55ae3 100644 --- a/tests/Polyhedron/weightwatch1.cc +++ b/tests/Polyhedron/weightwatch1.cc @@ -38,7 +38,7 @@ class Deterministic_Timeout public Parma_Polyhedra_Library::Throwable { public: const char* what() const throw() { - return "Deterministic timeout in weightwatch1.cc"; + return "deterministic timeout in weightwatch1.cc"; } void throw_me() const {

1 0

[GIT] ppl/ppl(floating_point): Added "affine from relation" section into definitions.dox.
by Fabio 17 Feb '10

17 Feb '10

Module: ppl/ppl Branch: floating_point Commit: 1e75fbc5ddcda7410ab9a64d7e213bbc2bb20eca URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1e75fbc5ddcd… Author: Fabio <Fabio(a)C1P4.(none)> Date: Wed Feb 17 17:02:05 2010 +0100 Added "affine from relation" section into definitions.dox. Fixed a reference to "affine from relation". --- doc/definitions.dox | 22 ++++++++++++++++++++++ src/Polyhedron.defs.hh | 2 +- 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/doc/definitions.dox b/doc/definitions.dox index f5437ad..48fd25d 100644 --- a/doc/definitions.dox +++ b/doc/definitions.dox @@ -1463,6 +1463,28 @@ is defined as \Bigr). \f] +\subsection affine_form_relation Affine Form Relations. +Let \f$\mathbb{F}_{\mathrm{f}}\f$ be the set of floating point numbers +representables in a certain +format \f$\mathrm{f}\f$ and let \f$\mathbb{I}_\mathrm{f}\f$ be the set of +real intervals with bounds in \f$\mathbb{F}_{\mathrm{f}}\f$. +We can define a floating-point interval linear form +\f$\langle\vect{\alpha}, \vect{x}\rangle + + \beta\f$ +as: + \f[\left<\vect{\alpha}, \vect{x}\right> + \beta = + \alpha_0x_0 + \ldots + + \alpha_{n-1}x_{n-1} + \beta,\f] + +where \f$\beta\f$, \f$\vect{\alpha}_k \in \mathbb{I}_{\mathrm{f}}\f$ +for each \f$k = 0, \ldots, n - 1\f$. + +Given a such linear form \f$\mathrm{lf}\f$ and a primed variable \f$x'_k\f$ the +affine form image operator computes the bounded affine image of a +polyhedron \f$\cP\f$ under \f$\mathrm{lb} \leq x'_k \leq \mathrm{ub}\f$, where +\f$\mathrm{lb}\f$ and \f$\mathrm{ub}\f$ are the upper and lower bound +of \f$\mathrm{lf}\f$ respectively. + \subsection Generalized_Affine_Relations Generalized Affine Relations. Similarly, the generalized affine relation \f$\phi = (\mathrm{lhs}' \relsym \mathrm{rhs})\f$, where diff --git a/src/Polyhedron.defs.hh b/src/Polyhedron.defs.hh index 09233d0..8981831 100644 --- a/src/Polyhedron.defs.hh +++ b/src/Polyhedron.defs.hh @@ -1222,7 +1222,7 @@ public: // FIXME: To be completed. /*! Assigns to \p *this the - \ref Single_Update_Affine_Form_Functions "affine form image" + \ref affine_form_relation "affine form image" of \p *this under the function mapping variable \p var into the affine expression(s) specified by \p lf.

1 0

[GIT] ppl/ppl(master): Drafted implementation for PIP_Problem's operator<<.
by Enea Zaffanella 17 Feb '10

17 Feb '10

Module: ppl/ppl Branch: master Commit: a7734015823e50eae1063582a30c6f9570669a8d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a7734015823e… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 17 14:50:11 2010 +0100 Drafted implementation for PIP_Problem's operator<<. --- src/MIP_Problem.cc | 2 +- src/PIP_Problem.cc | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 9c05c72..d5a6562 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -2245,5 +2245,5 @@ PPL::IO_Operators::operator<<(std::ostream& s, const MIP_Problem& lp) { ? "MAXIMIZATION" : "MINIMIZATION"); s << "\nInteger variables: " << lp.integer_space_dimensions(); - return s; + return s; } diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index bdefa78..f24043f 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -28,8 +28,18 @@ namespace PPL = Parma_Polyhedra_Library; /*! \relates Parma_Polyhedra_Library::PIP_Problem */ std::ostream& -PPL::IO_Operators::operator<<(std::ostream& s, const PIP_Problem& /*p*/) { - // FIXME: to be implemented. +PPL::IO_Operators::operator<<(std::ostream& s, const PIP_Problem& pip) { + s << "Space dimension: " << pip.space_dimension(); + s << "\nConstraints:"; + for (PIP_Problem::const_iterator i = pip.constraints_begin(), + i_end = pip.constraints_end(); i != i_end; ++i) + s << "\n" << *i; + s << "\nProblem parameters: " << pip.parameter_space_dimensions(); + if (pip.get_big_parameter_dimension() == not_a_dimension()) + s << "\nNo big-parameter set.\n"; + else + s << "\bBig-parameter: " << Variable(pip.get_big_parameter_dimension()); + s << "\n"; return s; } @@ -265,9 +275,7 @@ PPL::PIP_Problem::OK() const { if (big_parameter_dimension != not_a_dimension() && parameters.count(big_parameter_dimension) == 0) { #ifndef NDEBUG - cerr << "The current value for the big parameter is not a parameter " - << "dimension." - << endl; + cerr << "The big parameter is set, but it is not a parameter." << endl; ascii_dump(cerr); #endif return false;

1 0

[GIT] ppl/ppl(master): Tests adapted to use the new method for printing a PIP problem solution.
by Enea Zaffanella 17 Feb '10

17 Feb '10

Module: ppl/ppl Branch: master Commit: 64a04677743ef5fd4602007e72680ad172c03072 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=64a04677743e… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 17 13:13:57 2010 +0100 Tests adapted to use the new method for printing a PIP problem solution. --- tests/PIP_Problem/pipproblem1.cc | 96 ++++++-------------------------------- 1 files changed, 14 insertions(+), 82 deletions(-) diff --git a/tests/PIP_Problem/pipproblem1.cc b/tests/PIP_Problem/pipproblem1.cc index 6a1582d..7fb57ea 100644 --- a/tests/PIP_Problem/pipproblem1.cc +++ b/tests/PIP_Problem/pipproblem1.cc @@ -1,4 +1,4 @@ -/* Test the PIP_Problem class +/* Test the PIP_Problem class. Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> This file is part of the Parma Polyhedra Library (PPL). @@ -24,60 +24,6 @@ site: http://www.cs.unipr.it/ppl/ . */ namespace { -void -display_solution(const PIP_Tree pip, const Variables_Set& parameters, - const Variables_Set& vars, dimension_type space_dimension, - int indent=0) { - using namespace std; - using namespace Parma_Polyhedra_Library::IO_Operators; - if (!pip) { - nout << 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) { - nout << setw(indent*2) << "" << "Parameter " - << Linear_Expression(Variable(space_dimension++)) - << " = " << *i << endl; - } - const Constraint_System &constraints = pip->constraints(); - bool constraints_empty = constraints.empty(); - if (!constraints_empty) { - nout << setw(indent*2) << "" << "if "; - for (Constraint_System::const_iterator - begin = constraints.begin(), - end = constraints.end(), - i = begin; i != end; ++i) - nout << ((i == begin) ? "" : " and ") << *i; - nout << " then" << endl; - } - const PIP_Decision_Node* dn = pip->as_decision(); - if (dn) { - display_solution(dn->child_node(true), parameters, vars, - space_dimension, indent+1); - nout << setw(indent*2) << "" << "else" << endl; - display_solution(dn->child_node(false), parameters, vars, - space_dimension, indent+1); - } - else { - const PIP_Solution_Node* sn = pip->as_solution(); - nout << setw(indent*2 + (constraints_empty ? 0 : 2)) << "" << "{"; - for (Variables_Set::const_iterator - begin = vars.begin(), - end = vars.end(), - i = begin; i != end; ++i) - nout << ((i == begin) ? "" : " ; ") - << sn->parametric_values(Variable(*i), parameters); - nout << "}" << endl; - if (!constraints_empty) { - nout << setw(indent*2) << "" << "else" << endl; - nout << setw(indent*2+2) << "" << "_|_" << endl; - } - } - } -} - bool test01() { Variable X1(0); @@ -101,8 +47,7 @@ test01() { if (ok) { const PIP_Tree solution = pip.solution(); ok &= solution->OK(); - display_solution(solution, params, Variables_Set(X1, X2), - cs.space_dimension()); + pip.print_solution(nout); } return ok; @@ -129,8 +74,7 @@ test02() { if (ok) { const PIP_Tree solution = pip.solution(); ok &= solution->OK(); - display_solution(solution, params, Variables_Set(i, j), - cs.space_dimension()); + pip.print_solution(nout); } return ok; @@ -156,8 +100,7 @@ test03() { if (ok) { const PIP_Tree solution = pip.solution(); ok &= solution->OK(); - display_solution(solution, params, Variables_Set(i, j), - cs.space_dimension()); + pip.print_solution(nout); } return ok; @@ -183,8 +126,7 @@ test04() { if (ok) { const PIP_Tree solution = pip.solution(); ok &= solution->OK(); - display_solution(solution, params, Variables_Set(i, j), - cs.space_dimension()); + pip.print_solution(nout); } // Copy constructor is no longer buggy. @@ -194,8 +136,7 @@ test04() { // and we also destroy the (copied) solution tree of pip_copy. const PIP_Tree solution = pip_copy.solution(); ok &= solution->OK(); - display_solution(solution, params, Variables_Set(i, j), - cs.space_dimension()); + pip.print_solution(nout); } return ok; @@ -222,8 +163,7 @@ test05() { if (ok) { const PIP_Tree solution = pip.solution(); ok &= solution->OK(); - display_solution(solution, params, Variables_Set(i, j), - cs.space_dimension()); + pip.print_solution(nout); } return ok; @@ -241,11 +181,8 @@ test06() { PIP_Problem pip(cs.space_dimension(), cs.begin(), cs.end(), params); bool ok = (pip.solve() == UNFEASIBLE_PIP_PROBLEM); - if (ok) { - const PIP_Tree solution = pip.solution(); - display_solution(solution, params, Variables_Set(i), - cs.space_dimension()); - } + if (ok) + pip.print_solution(nout); return ok; } @@ -269,8 +206,7 @@ test07() { if (ok) { const PIP_Tree solution = pip.solution(); ok &= solution->OK(); - display_solution(solution, params, Variables_Set(i, j), - pip.space_dimension()); + pip.print_solution(nout); } pip.add_constraint(j <= m); @@ -278,8 +214,7 @@ test07() { if (ok) { const PIP_Tree solution = pip.solution(); ok &= solution->OK(); - display_solution(solution, params, Variables_Set(i, j), - pip.space_dimension()); + pip.print_solution(nout); } return ok; @@ -311,8 +246,7 @@ test08() { if (ok) { const PIP_Tree solution = pip.optimizing_solution(); ok &= solution->OK(); - display_solution(solution, params, Variables_Set(i, j), - pip.space_dimension()); + pip.print_solution(nout); pip.clear(); } @@ -342,8 +276,7 @@ test09() { if (ok) { const PIP_Tree solution = pip.solution(); ok &= solution->OK(); - display_solution(solution, params, Variables_Set(i, j), - cs.space_dimension()); + pip.print_solution(nout); } return ok; @@ -372,8 +305,7 @@ test10() { if (ok) { const PIP_Tree solution = pip.solution(); ok &= solution->OK(); - display_solution(solution, params, Variables_Set(i, j), - cs.space_dimension()); + pip.print_solution(nout); } return ok;

1 0

[GIT] ppl/ppl(master): Added method PIP_Problem::print_solution().
by Enea Zaffanella 17 Feb '10

17 Feb '10

Module: ppl/ppl Branch: master Commit: 7da6c43b438cf0948998e17eb6e8077fb39a7b1d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7da6c43b438c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 17 12:47:08 2010 +0100 Added method PIP_Problem::print_solution(). The new method exploits added virtual method PIP_Tree_Node::print_tree(). Implementation is based on code from the many display_solution() helper functions that are currently spread in the tests. --- src/PIP_Problem.cc | 26 ++++++++++++ src/PIP_Problem.defs.hh | 6 ++- src/PIP_Tree.cc | 99 +++++++++++++++++++++++++++++++++++++++++++++++ src/PIP_Tree.defs.hh | 51 ++++++++++++++++++++++++- 4 files changed, 179 insertions(+), 3 deletions(-) diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index 07248d4..bdefa78 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -639,3 +639,29 @@ PPL::memory_size_type PPL::PIP_Problem::total_memory_in_bytes() const { return sizeof(*this) + external_memory_in_bytes(); } + +void +PPL::PIP_Problem::print_solution(std::ostream& s, unsigned indent) const { + switch (status) { + + case UNSATISFIABLE: + PPL_ASSERT(current_solution == 0); + PIP_Tree_Node::indent_and_print(s, indent, "_|_\n"); + break; + + case OPTIMIZED: + PPL_ASSERT(current_solution); + PPL_ASSERT(internal_space_dim == external_space_dim); + current_solution->print_tree(s, indent, + internal_space_dim, + // NOTE: first_art_param == space_dim. + internal_space_dim, + parameters); + break; + + case PARTIALLY_SATISFIABLE: + throw std::domain_error("PIP_Problem::print_solution():\n" + "the PIP problem has not been solved."); + } +} + diff --git a/src/PIP_Problem.defs.hh b/src/PIP_Problem.defs.hh index 459a309..b4c6081 100644 --- a/src/PIP_Problem.defs.hh +++ b/src/PIP_Problem.defs.hh @@ -319,8 +319,7 @@ public: (resp., the parameter variables) is strictly greater than \p dim. */ template <typename In> - PIP_Problem(dimension_type dim, - In first, In last, + PIP_Problem(dimension_type dim, In first, In last, const Variables_Set& p_vars); //! Ordinary copy-constructor. @@ -456,6 +455,9 @@ public: //! Checks if all the invariants are satisfied. bool OK() const; + //! Prints on \p s the solution computed for \p *this. + void print_solution(std::ostream& s, unsigned indent = 0) const; + PPL_OUTPUT_DECLARATIONS /*! \brief diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 60b8fbf..4f08797 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -2470,4 +2470,103 @@ PIP_Solution_Node::total_memory_in_bytes() const { return sizeof(*this) + external_memory_in_bytes(); } +void +PIP_Tree_Node::indent_and_print(std::ostream& s, + const unsigned indent, + const char* str) { + s << std::setw(2*indent) << "" << str; +} + +void +PIP_Tree_Node::print_tree(std::ostream& s, + const unsigned indent, + const dimension_type space_dim, + dimension_type first_art_dim, + const Variables_Set& params) const { + used(space_dim); + used(params); + + using namespace IO_Operators; + + // Print artificial parameters. + for (Artificial_Parameter_Sequence::const_iterator + api = art_parameter_begin(), + api_end = art_parameter_end(); api != api_end; ++api) { + indent_and_print(s, indent, "Parameter "); + s << Variable(first_art_dim) << " = " << *api << "\n"; + ++first_art_dim; + } + + // Print constraints, if any. + if (!constraints_.empty()) { + indent_and_print(s, indent, "if "); + + Constraint_System::const_iterator + ci = constraints_.begin(), + ci_end = constraints_.end(); + PPL_ASSERT(ci != ci_end); + s << *ci; + for (++ci; ci != ci_end; ++ci) + s << " and " << *ci; + + s << " then\n"; + } +} + +void +PIP_Decision_Node::print_tree(std::ostream& s, unsigned indent, + const dimension_type space_dim, + const dimension_type first_art_dim, + const Variables_Set& params) const { + // First print info common to decision and solution nodes. + PIP_Tree_Node::print_tree(s, indent, space_dim, first_art_dim, params); + + // Then print info specific of decision nodes. + dimension_type child_first_art_dim = first_art_dim + art_parameter_count(); + + if (true_child) + true_child->print_tree(s, indent+1, space_dim, + child_first_art_dim, params); + else + indent_and_print(s, indent+1, "_|_\n"); + + indent_and_print(s, indent, "else\n"); + + if (false_child) + false_child->print_tree(s, indent+1, space_dim, + child_first_art_dim, params); + else + indent_and_print(s, indent+1, "_|_\n"); +} + +void +PIP_Solution_Node::print_tree(std::ostream& s, unsigned indent, + const dimension_type space_dim, + const dimension_type first_art_dim, + const Variables_Set& params) const { + // First print info common to decision and solution nodes. + PIP_Tree_Node::print_tree(s, indent, space_dim, first_art_dim, params); + + // Then print info specific of solution nodes. + const bool no_constraints = constraints_.empty(); + bool printed_first_variable = false; + indent_and_print(s, indent + (no_constraints ? 0 : 1), "{"); + for (dimension_type i = 0; i < space_dim; ++i) { + if (params.count(i) != 0) + continue; + if (printed_first_variable) + s << " ; "; + else + printed_first_variable = true; + using namespace IO_Operators; + s << parametric_values(Variable(i), params); + } + s << "}\n"; + + if (!no_constraints) { + indent_and_print(s, indent, "else\n"); + indent_and_print(s, indent+1, "_|_\n"); + } +} + } // namespace Parma_Polyhedra_Library diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh index cfaed23..1064746 100644 --- a/src/PIP_Tree.defs.hh +++ b/src/PIP_Tree.defs.hh @@ -1,4 +1,4 @@ -/* PIP_Tree class declaration. +/* PIP_Tree_Node class declaration. Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> This file is part of the Parma Polyhedra Library (PPL). @@ -93,6 +93,30 @@ public: //! Returns the number of local artificial parameters. dimension_type art_parameter_count() const; + //! Prints on \p s the tree rooted in \p *this. + /*! + \param s + The output stream. + + \param indent + The amount of indentation. + + \param space_dim + The space dimension of the PIP problem. + + \param first_art_dim + The first space dimension corresponding to an artificial parameter + that was created in this node (if any). + + \param params + The set of PIP problem parameters indices. + */ + virtual void print_tree(std::ostream& s, + unsigned indent, + dimension_type space_dim, + dimension_type first_art_dim, + const Variables_Set& params) const; + void ascii_dump(std::ostream& s) const; bool ascii_load(std::istream& s); @@ -200,6 +224,10 @@ protected: //! Inserts a new parametric constraint in internal Row format void add_constraint(const Row& x, const Variables_Set& parameters); + //! A helper function used when printing PIP trees. + static void + indent_and_print(std::ostream& s, unsigned indent, const char* str); + }; // class PIP_Tree_Node @@ -299,6 +327,13 @@ public: //! Returns \p this. virtual PIP_Solution_Node* as_solution(); + //! Prints on \p s the tree rooted in \p *this. + virtual void print_tree(std::ostream& s, + unsigned indent, + dimension_type space_dim, + dimension_type first_art_dim, + const Variables_Set& params) const; + /*! \brief Returns a parametric expression of the values of variable \p v. @@ -319,7 +354,14 @@ public: parametric_values(Variable v, const Variables_Set& parameters) const; + //! Dumps to \p s an ASCII representation of \p *this. void ascii_dump(std::ostream& s) const; + + /*! \brief + Loads from \p s an ASCII representation (as produced by + ascii_dump(std::ostream&) const) and sets \p *this accordingly. + Returns <CODE>true</CODE> if successful, <CODE>false</CODE> otherwise. + */ bool ascii_load(std::istream& s); //! Returns the total size in bytes of the memory occupied by \p *this. @@ -658,6 +700,13 @@ public: //! Returns a pointer to the \p b (true or false) branch of \p *this. PIP_Tree_Node* child_node(bool b); + //! Prints on \p s the tree rooted in \p *this. + virtual void print_tree(std::ostream& s, + unsigned indent, + dimension_type space_dim, + dimension_type first_art_dim, + const Variables_Set& params) const; + void ascii_dump(std::ostream& s) const; bool ascii_load(std::istream& s);

1 0

[GIT] ppl/ppl(master): Cater for systems where setitimer() is not provided (part 4).
by Roberto Bagnara 17 Feb '10

17 Feb '10

Module: ppl/ppl Branch: master Commit: 777f298702f1005f6c4f026fb7a4663bb8dadd0e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=777f298702f1… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Feb 17 12:33:34 2010 +0100 Cater for systems where setitimer() is not provided (part 4). --- Watchdog/src/pwl_header.hh | 3 +++ Watchdog/tests/simple1.cc | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Watchdog/src/pwl_header.hh b/Watchdog/src/pwl_header.hh index 4ac7d7e..3a65df6 100644 --- a/Watchdog/src/pwl_header.hh +++ b/Watchdog/src/pwl_header.hh @@ -31,6 +31,9 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "pwl-config.h" #include "pwl_include_files.hh" +//! Defined to 1 if PWL::Watchdog objects are supported, to 0 otherwise. +#define PWL_WATCHDOG_OBJECTS_ARE_SUPPORTED PWL_HAVE_DECL_SETITIMER + #ifdef PWL_SAVE_NDEBUG # ifndef NDEBUG # define NDEBUG PWL_SAVE_NDEBUG diff --git a/Watchdog/tests/simple1.cc b/Watchdog/tests/simple1.cc index ea86ec0..6876c5f 100644 --- a/Watchdog/tests/simple1.cc +++ b/Watchdog/tests/simple1.cc @@ -56,6 +56,12 @@ test01() { interrupt = false; return ok; } +#if !PWL_WATCHDOG_OBJECTS_ARE_SUPPORTED + catch (std::runtime_error& e) { + nout << "runtime_error: " << e.what() << endl << endl; + return true; + } +#endif // !PWL_WATCHDOG_OBJECTS_ARE_SUPPORTED catch (...) { return false; }

1 0

[GIT] ppl/ppl(master): Cater for systems where setitimer() is not provided (part 3).
by Roberto Bagnara 17 Feb '10

17 Feb '10

Module: ppl/ppl Branch: master Commit: eab6ab2fd4e44c8e7348c26112e4c9e4190e88ee URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=eab6ab2fd4e4… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Feb 17 12:22:12 2010 +0100 Cater for systems where setitimer() is not provided (part 3). --- Watchdog/src/Watchdog.cc | 10 ++++------ Watchdog/src/Watchdog.inlines.hh | 24 ++++++++++++++++++++---- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/Watchdog/src/Watchdog.cc b/Watchdog/src/Watchdog.cc index 1b2fcb2..68ed01f 100644 --- a/Watchdog/src/Watchdog.cc +++ b/Watchdog/src/Watchdog.cc @@ -24,6 +24,8 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "Watchdog.defs.hh" +namespace PWL = Parma_Watchdog_Library; + #if PWL_HAVE_DECL_SETITIMER #include <csignal> @@ -54,8 +56,6 @@ site: http://www.cs.unipr.it/ppl/ . */ #define THE_SIGNAL SIGPROF #endif -namespace PWL = Parma_Watchdog_Library; - using std::cerr; using std::endl; @@ -222,11 +222,8 @@ PWL::Watchdog::remove_watchdog_event(WD_Pending_List::Iterator position) { PWL::Time PWL::Watchdog::reschedule_time(1); -#endif // PWL_HAVE_DECL_SETITIMER - void PWL::Watchdog::initialize() { -#if PWL_HAVE_DECL_SETITIMER signal_once.it_interval.tv_sec = 0; signal_once.it_interval.tv_usec = 0; @@ -239,11 +236,12 @@ PWL::Watchdog::initialize() { s.sa_flags = 0; // Was SA_ONESHOT: why? my_sigaction(THE_SIGNAL, &s, 0); -#endif // PWL_HAVE_DECL_SETITIMER } void PWL::Watchdog::finalize() { } +#endif // PWL_HAVE_DECL_SETITIMER + unsigned int PWL::Init::count = 0; diff --git a/Watchdog/src/Watchdog.inlines.hh b/Watchdog/src/Watchdog.inlines.hh index 016926d..80258dd 100644 --- a/Watchdog/src/Watchdog.inlines.hh +++ b/Watchdog/src/Watchdog.inlines.hh @@ -71,6 +71,24 @@ Watchdog::reschedule() { set_timer(reschedule_time); } +inline +Init::Init() { + // Only when the first Init object is constructed... + if (count++ == 0) { + // ... the library is initialized. + Watchdog::initialize(); + } +} + +inline +Init::~Init() { + // Only when the last Init object is destroyed... + if (--count == 0) { + // ... the library is finalized. + Watchdog::finalize(); + } +} + #else // !PWL_HAVE_DECL_SETITIMER template <typename Flag_Base, typename Flag> @@ -91,14 +109,11 @@ inline Watchdog::~Watchdog() { } -#endif // !PWL_HAVE_DECL_SETITIMER - inline Init::Init() { // Only when the first Init object is constructed... if (count++ == 0) { // ... the library is initialized. - Watchdog::initialize(); } } @@ -107,10 +122,11 @@ Init::~Init() { // Only when the last Init object is destroyed... if (--count == 0) { // ... the library is finalized. - Watchdog::finalize(); } } +#endif // !PWL_HAVE_DECL_SETITIMER + } // namespace Parma_Watchdog_Library #endif // !defined(PWL_Watchdog_inlines_hh)

1 0

[GIT] ppl/ppl(master): Cater for systems where setitimer() is not provided (part 2).
by Roberto Bagnara 17 Feb '10

17 Feb '10

Module: ppl/ppl Branch: master Commit: 8ac2c64c2e9fa2da2d02428fe51c34b8dca3d6ff URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8ac2c64c2e9f… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Feb 17 12:15:35 2010 +0100 Cater for systems where setitimer() is not provided (part 2). --- TODO | 4 ---- Watchdog/pwl-config.sed | 1 + Watchdog/src/Watchdog.cc | 17 +++++++---------- Watchdog/src/Watchdog.defs.hh | 4 ++-- Watchdog/src/Watchdog.inlines.hh | 35 +++++++++++++++++++++++------------ 5 files changed, 33 insertions(+), 28 deletions(-) diff --git a/TODO b/TODO index 8c3cf6d..835ea2c 100644 --- a/TODO +++ b/TODO @@ -2,10 +2,6 @@ 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 diff --git a/Watchdog/pwl-config.sed b/Watchdog/pwl-config.sed index 15a0d31..7972470 100644 --- a/Watchdog/pwl-config.sed +++ b/Watchdog/pwl-config.sed @@ -1,5 +1,6 @@ s/$[^A-Z_]$HAVE_DECL_GETENV/\1PWL_HAVE_DECL_GETENV/g s/$[^A-Z_]$HAVE_DECL_SIGACTION/\1PWL_HAVE_DECL_SIGACTION/g +s/$[^A-Z_]$HAVE_DECL_SETITIMER/\1PWL_HAVE_DECL_SETITIMER/g s/$[^A-Z_]$HAVE_DLFCN_H/\1PWL_HAVE_DLFCN_H/g s/$[^A-Z_]$HAVE_FENV_H/\1PWL_HAVE_FENV_H/g s/$[^A-Z_]$HAVE_INTTYPES_H/\1PWL_HAVE_INTTYPES_H/g diff --git a/Watchdog/src/Watchdog.cc b/Watchdog/src/Watchdog.cc index 03e259e..1b2fcb2 100644 --- a/Watchdog/src/Watchdog.cc +++ b/Watchdog/src/Watchdog.cc @@ -24,6 +24,8 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "Watchdog.defs.hh" +#if PWL_HAVE_DECL_SETITIMER + #include <csignal> #include <iostream> #include <stdexcept> @@ -218,17 +220,13 @@ PWL::Watchdog::remove_watchdog_event(WD_Pending_List::Iterator position) { pending.erase(position); } -PWL::Watchdog::~Watchdog() { - if (!expired) { - in_critical_section = true; - remove_watchdog_event(pending_position); - in_critical_section = false; - } - delete &handler; -} +PWL::Time PWL::Watchdog::reschedule_time(1); + +#endif // PWL_HAVE_DECL_SETITIMER void PWL::Watchdog::initialize() { +#if PWL_HAVE_DECL_SETITIMER signal_once.it_interval.tv_sec = 0; signal_once.it_interval.tv_usec = 0; @@ -241,12 +239,11 @@ PWL::Watchdog::initialize() { s.sa_flags = 0; // Was SA_ONESHOT: why? my_sigaction(THE_SIGNAL, &s, 0); +#endif // PWL_HAVE_DECL_SETITIMER } void PWL::Watchdog::finalize() { } -PWL::Time PWL::Watchdog::reschedule_time(1); - unsigned int PWL::Init::count = 0; diff --git a/Watchdog/src/Watchdog.defs.hh b/Watchdog/src/Watchdog.defs.hh index 3b1b3ba..a6ec958 100644 --- a/Watchdog/src/Watchdog.defs.hh +++ b/Watchdog/src/Watchdog.defs.hh @@ -61,7 +61,7 @@ public: //! Destructor. ~Watchdog(); -#if HAVE_DECL_SETITIMER +#if PWL_HAVE_DECL_SETITIMER private: typedef Pending_List<Watchdog_Traits> WD_Pending_List; @@ -133,7 +133,7 @@ private: friend void PWL_handle_timeout(int signum); -#endif // HAVE_DECL_SETITIMER +#endif // PWL_HAVE_DECL_SETITIMER }; class Init { diff --git a/Watchdog/src/Watchdog.inlines.hh b/Watchdog/src/Watchdog.inlines.hh index a24dd35..016926d 100644 --- a/Watchdog/src/Watchdog.inlines.hh +++ b/Watchdog/src/Watchdog.inlines.hh @@ -29,11 +29,12 @@ site: http://www.cs.unipr.it/ppl/ . */ namespace Parma_Watchdog_Library { -#if HAVE_DECL_SETITIMER +#if PWL_HAVE_DECL_SETITIMER template <typename Flag_Base, typename Flag> Watchdog::Watchdog(unsigned int units, - const Flag_Base* volatile& holder, Flag& flag) + const Flag_Base* volatile& holder, + Flag& flag) : expired(false), handler(*new Handler_Flag<Flag_Base, Flag>(holder, flag)) { if (units == 0) @@ -55,32 +56,42 @@ Watchdog::Watchdog(unsigned int units, void (*function)()) in_critical_section = false; } +inline +Watchdog::~Watchdog() { + if (!expired) { + in_critical_section = true; + remove_watchdog_event(pending_position); + in_critical_section = false; + } + delete &handler; +} + inline void Watchdog::reschedule() { set_timer(reschedule_time); } -#else // !HAVE_DECL_SETITIMER +#else // !PWL_HAVE_DECL_SETITIMER template <typename Flag_Base, typename Flag> -Watchdog::Watchdog(unsigned int units, - const Flag_Base* volatile& holder, Flag& flag) { - used(units); - used(holder); - used(flag); +Watchdog::Watchdog(unsigned int /* units */, + const Flag_Base* volatile& /* holder */, + Flag& /* flag */) { throw std::runtime_error("PWL::Watchdog objects not supported:" " system does not provide setitimer()"); } inline -Watchdog::Watchdog(unsigned int units, void (*function)()) { - used(units); - used(function); +Watchdog::Watchdog(unsigned int /* units */, void (* /* function */)()) { throw std::runtime_error("PWL::Watchdog objects not supported:" " system does not provide setitimer()"); } -#endif // HAVE_DECL_SETITIMER +inline +Watchdog::~Watchdog() { +} + +#endif // !PWL_HAVE_DECL_SETITIMER inline Init::Init() {

1 0

[GIT] ppl/ppl(master): Cater for systems where setitimer() is not provided (part 1).
by Roberto Bagnara 17 Feb '10

17 Feb '10

Module: ppl/ppl Branch: master Commit: 9bdd6617be52573d3252687844d32001e671a126 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9bdd6617be52… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Feb 17 11:56:08 2010 +0100 Cater for systems where setitimer() is not provided (part 1). --- Watchdog/src/Watchdog.defs.hh | 4 ++++ Watchdog/src/Watchdog.inlines.hh | 32 ++++++++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/Watchdog/src/Watchdog.defs.hh b/Watchdog/src/Watchdog.defs.hh index eace4b3..3b1b3ba 100644 --- a/Watchdog/src/Watchdog.defs.hh +++ b/Watchdog/src/Watchdog.defs.hh @@ -61,6 +61,8 @@ public: //! Destructor. ~Watchdog(); +#if HAVE_DECL_SETITIMER + private: typedef Pending_List<Watchdog_Traits> WD_Pending_List; friend class Init; @@ -130,6 +132,8 @@ private: static volatile bool in_critical_section; friend void PWL_handle_timeout(int signum); + +#endif // HAVE_DECL_SETITIMER }; class Init { diff --git a/Watchdog/src/Watchdog.inlines.hh b/Watchdog/src/Watchdog.inlines.hh index 47340fc..a24dd35 100644 --- a/Watchdog/src/Watchdog.inlines.hh +++ b/Watchdog/src/Watchdog.inlines.hh @@ -29,10 +29,7 @@ site: http://www.cs.unipr.it/ppl/ . */ namespace Parma_Watchdog_Library { -inline void -Watchdog::reschedule() { - set_timer(reschedule_time); -} +#if HAVE_DECL_SETITIMER template <typename Flag_Base, typename Flag> Watchdog::Watchdog(unsigned int units, @@ -58,6 +55,33 @@ Watchdog::Watchdog(unsigned int units, void (*function)()) in_critical_section = false; } +inline void +Watchdog::reschedule() { + set_timer(reschedule_time); +} + +#else // !HAVE_DECL_SETITIMER + +template <typename Flag_Base, typename Flag> +Watchdog::Watchdog(unsigned int units, + const Flag_Base* volatile& holder, Flag& flag) { + used(units); + used(holder); + used(flag); + throw std::runtime_error("PWL::Watchdog objects not supported:" + " system does not provide setitimer()"); +} + +inline +Watchdog::Watchdog(unsigned int units, void (*function)()) { + used(units); + used(function); + throw std::runtime_error("PWL::Watchdog objects not supported:" + " system does not provide setitimer()"); +} + +#endif // HAVE_DECL_SETITIMER + inline Init::Init() { // Only when the first Init object is constructed...

1 0