July 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Updated.
by Roberto Bagnara 12 Jul '09

12 Jul '09

Module: ppl/ppl Branch: master Commit: 1175ae2b9f7628c041fb5bf67e422d821f6df634 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1175ae2b9f76… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jul 12 11:46:02 2009 +0200 Updated. --- Watchdog/m4/lib-link.m4 | 355 +++++++++++++++++++++++++++++++++++++---------- m4/lib-link.m4 | 7 +- 2 files changed, 288 insertions(+), 74 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=1175ae2b…

1 0

[GIT] ppl/ppl(master): Require Automake 1.11, enable lzma tar archives and silent rules.
by Roberto Bagnara 12 Jul '09

12 Jul '09

Module: ppl/ppl Branch: master Commit: 39fdc5887541bfffb981fc77541d9046e8f15d2a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=39fdc5887541… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jul 12 11:24:28 2009 +0200 Require Automake 1.11, enable lzma tar archives and silent rules. --- Watchdog/configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Watchdog/configure.ac b/Watchdog/configure.ac index 42fb136..8a4b069 100644 --- a/Watchdog/configure.ac +++ b/Watchdog/configure.ac @@ -39,7 +39,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_HOST # Use Automake. -AM_INIT_AUTOMAKE([foreign no-define dist-bzip2 dist-zip 1.7.3]) +AM_INIT_AUTOMAKE([foreign no-define dist-bzip2 dist-zip dist-lzma silent-rules 1.11]) AC_SUBST(VERSION) # Generate a configuration header file.

1 0

[GIT] ppl/ppl(master): Avoid dummy parameter in constructor for Threshold_Watcher::Initialize.
by Enea Zaffanella 12 Jul '09

12 Jul '09

Module: ppl/ppl Branch: master Commit: 0742e3828ce42ee511948a17efd4af8efb098c11 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0742e3828ce4… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Jul 12 11:12:29 2009 +0200 Avoid dummy parameter in constructor for Threshold_Watcher::Initialize. Renamed `initialize' to `init' to avoid visual clash with `Initialize'. --- Watchdog/src/Threshold_Watcher.defs.hh | 4 +--- Watchdog/src/Threshold_Watcher.templates.hh | 12 ++++++------ tests/Polyhedron/weightwatch1.cc | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Watchdog/src/Threshold_Watcher.defs.hh b/Watchdog/src/Threshold_Watcher.defs.hh index e2f8f55..6d11c18 100644 --- a/Watchdog/src/Threshold_Watcher.defs.hh +++ b/Watchdog/src/Threshold_Watcher.defs.hh @@ -54,12 +54,10 @@ private: Threshold_Watcher& operator=(const Threshold_Watcher&); struct Initialize { - Initialize(int) { - } //! The ordered queue of pending thresholds. WW_Pending_List pending; }; - static Initialize initialize; + static Initialize init; // Handle the addition of a new threshold. static typename WW_Pending_List::Iterator diff --git a/Watchdog/src/Threshold_Watcher.templates.hh b/Watchdog/src/Threshold_Watcher.templates.hh index a133775..9c55f79 100644 --- a/Watchdog/src/Threshold_Watcher.templates.hh +++ b/Watchdog/src/Threshold_Watcher.templates.hh @@ -31,15 +31,15 @@ Threshold_Watcher<Traits>::add_threshold(typename Traits::Threshold threshold, const Handler& handler, bool& expired_flag) { Traits::check_function = Threshold_Watcher::check; - return initialize.pending.insert(threshold, handler, expired_flag); + return init.pending.insert(threshold, handler, expired_flag); } template <typename Traits> typename Threshold_Watcher<Traits>::WW_Pending_List::Iterator Threshold_Watcher<Traits> ::remove_threshold(typename WW_Pending_List::Iterator position) { - typename WW_Pending_List::Iterator i = initialize.pending.erase(position); - if (initialize.pending.empty()) + typename WW_Pending_List::Iterator i = init.pending.erase(position); + if (init.pending.empty()) Traits::check_function = 0; return i; } @@ -54,14 +54,14 @@ Threshold_Watcher<Traits>::~Threshold_Watcher() { template <typename Traits> void Threshold_Watcher<Traits>::check() { - typename WW_Pending_List::Iterator i = initialize.pending.begin(); - assert(i != initialize.pending.end()); + typename WW_Pending_List::Iterator i = init.pending.begin(); + assert(i != init.pending.end()); const typename Traits::Threshold& current = Traits::get(); while (!Traits::less_than(current, i->deadline())) { i->handler().act(); i->expired_flag() = true; i = remove_threshold(i); - if (i == initialize.pending.end()) + if (i == init.pending.end()) break; } } diff --git a/tests/Polyhedron/weightwatch1.cc b/tests/Polyhedron/weightwatch1.cc index 1386131..ff8960b 100644 --- a/tests/Polyhedron/weightwatch1.cc +++ b/tests/Polyhedron/weightwatch1.cc @@ -29,8 +29,8 @@ namespace { typedef Parma_Watchdog_Library::Threshold_Watcher<Weightwatch_Traits> Weightwatch; -template <> -Weightwatch::Initialize Weightwatch::initialize(0); +template <> Weightwatch::Initialize +Weightwatch::init = Weightwatch::Initialize(); class Deterministic_Timeout

1 0

[GIT] ppl/ppl(master): Updated.
by Roberto Bagnara 12 Jul '09

12 Jul '09

Module: ppl/ppl Branch: master Commit: e5b0647b63bda876d877869dc0e9d7f8dda64e5b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e5b0647b63bd… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jul 12 11:15:18 2009 +0200 Updated. --- INSTALL | 17 ++++++++-- Watchdog/INSTALL | 17 ++++++++-- Watchdog/compile | 17 +++++---- Watchdog/config.guess | 40 ++++++++++++++++++++-- Watchdog/config.sub | 19 ++++++++--- Watchdog/depcomp | 87 +++++++++++++++++++++++++++++++++++------------- Watchdog/install-sh | 5 ++- Watchdog/missing | 49 ++++++++++++++++----------- Watchdog/mkinstalldirs | 5 ++- compile | 17 +++++---- config.guess | 40 ++++++++++++++++++++-- config.sub | 19 ++++++++--- depcomp | 87 +++++++++++++++++++++++++++++++++++------------- install-sh | 5 ++- missing | 49 ++++++++++++++++----------- mkinstalldirs | 5 ++- 16 files changed, 344 insertions(+), 134 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=e5b0647b…

1 0

[GIT] ppl/ppl(master): Require Automake 1.11, enable lzma tar archives and silent rules.
by Roberto Bagnara 12 Jul '09

12 Jul '09

Module: ppl/ppl Branch: master Commit: f36bad689490f3376f8145bdda8c2ae718a91657 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f36bad689490… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jul 12 10:13:04 2009 +0200 Require Automake 1.11, enable lzma tar archives and silent rules. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index af6ee86..fd5bc8c 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_HOST # Use Automake. -AM_INIT_AUTOMAKE([foreign no-define dist-bzip2 dist-zip tar-ustar 1.9]) +AM_INIT_AUTOMAKE([foreign no-define dist-bzip2 dist-zip dist-lzma tar-ustar silent-rules 1.11]) AC_SUBST(VERSION)

1 0

[GIT] ppl/ppl(master): Added a first test for the deterministic timeout.
by Enea Zaffanella 12 Jul '09

12 Jul '09

Module: ppl/ppl Branch: master Commit: 1fec820348a7ebe1ebedd8c3d860ac04ed508f42 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1fec820348a7… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Jul 12 09:18:13 2009 +0200 Added a first test for the deterministic timeout. --- tests/Polyhedron/Makefile.am | 23 +++- tests/Polyhedron/weightwatch1.cc | 242 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 260 insertions(+), 5 deletions(-) diff --git a/tests/Polyhedron/Makefile.am b/tests/Polyhedron/Makefile.am index 9a2acb0..99b75fa 100644 --- a/tests/Polyhedron/Makefile.am +++ b/tests/Polyhedron/Makefile.am @@ -644,6 +644,8 @@ memory1_SRCS = memory1.cc watchdog1_SRCS = watchdog1.cc +weightwatch1_SRCS = weightwatch1.cc + if !VALGRIND_TESTS_ENABLED VALGRIND_BRITTLE_TESTS = memory1 @@ -653,14 +655,25 @@ endif !VALGRIND_TESTS_ENABLED if BUILD_WATCHDOG_LIBRARY -WATCHDOG_TESTS = watchdog1 -watchdog1_SOURCES = $(watchdog1_SRCS) -watchdog1_CPPFLAGS = \ +WATCHDOG_TESTS = \ +watchdog1 \ +weightwatch1 + +WATCHDOG_LIBRARY_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_builddir)/Watchdog \ -I$(top_builddir)/Watchdog/src -watchdog1_LDADD = $(LDADD) $(top_builddir)/Watchdog/src/libpwl.la + +WATCHDOG_LIBRARY_LDADD = $(LDADD) $(top_builddir)/Watchdog/src/libpwl.la + +watchdog1_SOURCES = $(watchdog1_SRCS) +watchdog1_CPPFLAGS = $(WATCHDOG_LIBRARY_CPPFLAGS) +watchdog1_LDADD = $(WATCHDOG_LIBRARY_LDADD) + +weightwatch1_SOURCES = $(weightwatch1_SRCS) +weightwatch1_CPPFLAGS = $(WATCHDOG_LIBRARY_CPPFLAGS) +weightwatch1_LDADD = $(WATCHDOG_LIBRARY_LDADD) endif BUILD_WATCHDOG_LIBRARY @@ -674,7 +687,7 @@ XFAIL_TESTS = check_PROGRAMS = $(TESTS) $(BUGS) -EXTRA_DIST = $(memory1_SRCS) $(watchdog1_SRCS) +EXTRA_DIST = $(memory1_SRCS) $(watchdog1_SRCS) $(weightwatch1_SRCS) BUGS = diff --git a/tests/Polyhedron/weightwatch1.cc b/tests/Polyhedron/weightwatch1.cc new file mode 100644 index 0000000..1386131 --- /dev/null +++ b/tests/Polyhedron/weightwatch1.cc @@ -0,0 +1,242 @@ +/* Test the weightwatch (i.e., deterministic timeout) facility of the library. + Copyright (C) 2001-2009 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://www.cs.unipr.it/ppl/ . */ + +#include "ppl_test.hh" +#include "pwl.hh" +#include <stdexcept> + +namespace { + +typedef +Parma_Watchdog_Library::Threshold_Watcher<Weightwatch_Traits> Weightwatch; + +template <> +Weightwatch::Initialize Weightwatch::initialize(0); + + +class Deterministic_Timeout + : virtual public std::exception, + public Parma_Polyhedra_Library::Throwable { +public: + const char* what() const throw() { + return "Deterministic timeout in weightwatch1.cc"; + } + + void throw_me() const { + throw *this; + } + + int priority() const { + return 0; + } + + ~Deterministic_Timeout() throw() { + } +}; + +void too_fat() { + throw Deterministic_Timeout(); +} + +bool test01() { + Variable A(0); + Variable B(1); + Variable C(2); + Variable D(3); + Variable E(4); + Variable F(5); + Variable G(6); + Variable H(7); + Variable I(8); + Variable J(9); + Variable K(10); + Variable L(11); + Variable M(12); + Variable N(13); + Variable O(14); + Variable P(15); + Variable Q(16); + Variable R(17); + + Constraint_System cs; + cs.insert(B + 8192*D - R == 0); + cs.insert(Q == 1); + cs.insert(B + 8192*D - P == 0); + cs.insert(O == 1); + cs.insert(B + 8192*D - I - 8192*N == 0); + cs.insert(I - M == 0); + cs.insert(L == 0); + cs.insert(B + 8192*D - I - 8192*K == 0); + cs.insert(J == 0); + cs.insert(H == 0); + cs.insert(D - G == 0); + cs.insert(B - F == 0); + cs.insert(E == 0); + cs.insert(C == 0); + cs.insert(A == 0); + // Blind relaxation of strict constraint B - I > 0. + cs.insert(B - I >= 0); + cs.insert(-B - 8192*D + I >= -67100672); + cs.insert(-B >= -8191); + cs.insert(I >= 0); + cs.insert(D >= 0); + + C_Polyhedron ph(cs); + print_constraints(ph, "*** ph ***"); + + try { + Weightwatch ww(400, too_fat); + // Thanks to the blind relaxation of the strict inequality constraint, + // polyhedron ph is easily seen to contain an integer point. + const bool contains = ph.contains_integer_point(); + nout << "\nph " << (contains ? "contains" : "does not contain") + << " an integer point" << endl; + return contains; + } + catch (const Deterministic_Timeout& e) { + // Unexpected timeout exception. + nout << e.what() << endl; + return false; + } + catch (...) { + // Unexpected exception. + return false; + } + // Should never get here. + return false; +} + +bool test02() { + Variable A(0); + Variable B(1); + Variable C(2); + Variable D(3); + Variable E(4); + Variable F(5); + Variable G(6); + Variable H(7); + Variable I(8); + Variable J(9); + Variable K(10); + Variable L(11); + Variable M(12); + Variable N(13); + Variable O(14); + Variable P(15); + Variable Q(16); + Variable R(17); + + Constraint_System cs; + cs.insert(B + 8192*D - R == 0); + cs.insert(Q == 1); + cs.insert(B + 8192*D - P == 0); + cs.insert(O == 1); + cs.insert(B + 8192*D - I - 8192*N == 0); + cs.insert(I - M == 0); + cs.insert(L == 0); + cs.insert(B + 8192*D - I - 8192*K == 0); + cs.insert(J == 0); + cs.insert(H == 0); + cs.insert(D - G == 0); + cs.insert(B - F == 0); + cs.insert(E == 0); + cs.insert(C == 0); + cs.insert(A == 0); + // Rewriting the strict constraint B - I > 0. + cs.insert(B - I >= 1); + cs.insert(-B - 8192*D + I >= -67100672); + cs.insert(-B >= -8191); + cs.insert(I >= 0); + cs.insert(D >= 0); + + C_Polyhedron ph(cs); + print_constraints(ph, "*** ph ***"); + + try { + Weightwatch ww(400, too_fat); + // The branch-and-bound heuristics of the MIP solver behaves badly + // on this particular example, causing timeout to expire. + const bool contains = ph.contains_integer_point(); + nout << "ph " << (contains ? "contains" : "does not contain") + << " an integer point" << endl; + return false; + } + catch (const Deterministic_Timeout& e) { + // Expected exception. + nout << e.what() << endl; + return true; + } + catch (...) { + // Unexpected exception. + return false; + } + // Should never get here. + return false; +} + +bool test03() { + Variable A(0); + Variable B(1); + Variable C(2); + Variable D(3); + + Constraint_System cs; + cs.insert(8192*A + B - 8192*C - D == 0); + cs.insert(D >= 0); + cs.insert(-B >= -8191); + cs.insert(B -D >= 1); + cs.insert(-B + 8192*C + D >= 0); + cs.insert(-C >= -8191); + + C_Polyhedron ph(cs); + print_constraints(ph, "*** ph ***"); + + try { + Weightwatch ww(400, too_fat); + // Polyhedron ph is the projection of the polyehdron of test01 + // onto a lower dimensional space: the performance issue of previous + // test does not depend on high dimension vector space. + const bool contains = ph.contains_integer_point(); + nout << "ph " << (contains ? "contains" : "does not contain") + << " an integer point" << endl; + return false; + } + catch (const Deterministic_Timeout& e) { + // Expected exception. + nout << e.what() << endl; + return true; + } + catch (...) { + // Unexpected exception. + return false; + } + // Should never get here. + return false; +} + +} // namespace + +BEGIN_MAIN + DO_TEST(test01); + DO_TEST(test02); + DO_TEST(test03); +END_MAIN

1 0

[GIT] ppl/ppl(master): Added Weightwatch_Traits class (from Abramo). Modified maybe_abandon().
by Enea Zaffanella 12 Jul '09

12 Jul '09

Module: ppl/ppl Branch: master Commit: 4cb9790c6f741a636aa6bbd0e4619acbcfa34305 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4cb9790c6f74… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Jul 12 09:14:52 2009 +0200 Added Weightwatch_Traits class (from Abramo). Modified maybe_abandon(). --- src/globals.cc | 3 +++ src/globals.defs.hh | 38 ++++++++++++++++++++++++++++++++++++++ src/globals.inlines.hh | 19 +++++++++++++++++++ 3 files changed, 60 insertions(+), 0 deletions(-) diff --git a/src/globals.cc b/src/globals.cc index 9325c4e..7511d17 100644 --- a/src/globals.cc +++ b/src/globals.cc @@ -30,3 +30,6 @@ namespace PPL = Parma_Polyhedra_Library; const PPL::Throwable* volatile PPL::abandon_expensive_computations = 0; +// Initialize Weightwatch_Traits static data members. +PPL::Weightwatch_Traits::Threshold PPL::Weightwatch_Traits::weight = 0; +void (*PPL::Weightwatch_Traits::check_function)(void) = 0; diff --git a/src/globals.defs.hh b/src/globals.defs.hh index a6e943c..6bfe173 100644 --- a/src/globals.defs.hh +++ b/src/globals.defs.hh @@ -84,6 +84,44 @@ dimension_type compute_capacity(dimension_type requested_size, dimension_type maximum_size); + +#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS +//! Traits class for the deterministic timeout mechanism. +/*! \ingroup PPL_CXX_interface + This abstract base class should be instantiated by those users + willing to provide a polynomial upper bound to the time spent + by any invocation of a library operator. +*/ +#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) +struct Weightwatch_Traits { + //! The type used to specify thresholds for computational weight. + typedef unsigned int Threshold; + + //! The type used to specify increments of computational weight. + typedef unsigned int Delta; + + //! Returns the current computational weight. + static const Threshold& get(); + + //! Compares the two weights \p a and \p b. + static bool less_than(const Threshold& a, const Threshold& b); + + //! Sets \p threshold to be \p delta units bigger than the current weigth. + static void from_delta(Threshold& threshold, const Delta& delta); + + //! The current computational weight. + static Threshold weight; + + /*! \brief + A pointer to the function that has to be called when checking + the reaching of thresholds. + + The pointer can be null if no threshold are set. + */ + static void (*check_function)(void); +}; + + //! User objects the PPL can throw. /*! \ingroup PPL_CXX_interface This abstract base class should be instantiated by those users diff --git a/src/globals.inlines.hh b/src/globals.inlines.hh index f35672a..75d104e 100644 --- a/src/globals.inlines.hh +++ b/src/globals.inlines.hh @@ -33,12 +33,31 @@ not_a_dimension() { return std::numeric_limits<dimension_type>::max(); } +inline const Weightwatch_Traits::Threshold& +Weightwatch_Traits::get() { + return weight; +} + +inline bool +Weightwatch_Traits::less_than(const Threshold& a, const Threshold& b) { + return b - a < 1U << (sizeof(Threshold)*8-1); +} + +inline void +Weightwatch_Traits::from_delta(Threshold& threshold, const Delta& delta) { + threshold = weight + delta; +} + inline Throwable::~Throwable() { } inline void maybe_abandon() { + if (Weightwatch_Traits::check_function) { + ++Weightwatch_Traits::weight; + Weightwatch_Traits::check_function(); + } if (const Throwable* p = abandon_expensive_computations) p->throw_me(); }

1 0

[GIT] ppl/ppl(master): Minor improvements: prefer direct header file inclusions to indirect ones.
by Enea Zaffanella 12 Jul '09

12 Jul '09

Module: ppl/ppl Branch: master Commit: 78c8fb6cebda65e57b79176eb7aff2995db8d726 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=78c8fb6cebda… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Jul 12 08:11:22 2009 +0200 Minor improvements: prefer direct header file inclusions to indirect ones. Avoid unnecessarily long lines. --- Watchdog/src/EList.defs.hh | 4 +++- Watchdog/src/Threshold_Watcher.cc | 3 ++- Watchdog/src/Threshold_Watcher.defs.hh | 14 +++++++------- Watchdog/src/Threshold_Watcher.templates.hh | 10 +++++----- Watchdog/src/Threshold_Watcher.types.hh | 4 +++- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Watchdog/src/EList.defs.hh b/Watchdog/src/EList.defs.hh index e16ceb0..fbb9696 100644 --- a/Watchdog/src/EList.defs.hh +++ b/Watchdog/src/EList.defs.hh @@ -24,6 +24,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #define PWL_EList_defs_hh 1 #include "EList.types.hh" +#include "Doubly_Linked_Object.defs.hh" #include "EList_Iterator.defs.hh" /*! \brief @@ -31,7 +32,8 @@ site: http://www.cs.unipr.it/ppl/ . */ where the links are embedded in the objects themselves). */ template <typename T> -class Parma_Watchdog_Library::EList : private Doubly_Linked_Object { +class Parma_Watchdog_Library::EList + : private Parma_Watchdog_Library::Doubly_Linked_Object { public: //! A const iterator to traverse the list. typedef EList_Iterator<const T> Const_Iterator; diff --git a/Watchdog/src/Threshold_Watcher.cc b/Watchdog/src/Threshold_Watcher.cc index 75c1368..50374e2 100644 --- a/Watchdog/src/Threshold_Watcher.cc +++ b/Watchdog/src/Threshold_Watcher.cc @@ -1,4 +1,5 @@ -/* Threshold_Watcher and associated classes' implementation (non-inline functions). +/* Threshold_Watcher and associated classes' implementation + (non-inline functions). Copyright (C) 2001-2009 Roberto Bagnara <bagnara(a)cs.unipr.it> This file is part of the Parma Watchdog Library (PWL). diff --git a/Watchdog/src/Threshold_Watcher.defs.hh b/Watchdog/src/Threshold_Watcher.defs.hh index 132c973..e2f8f55 100644 --- a/Watchdog/src/Threshold_Watcher.defs.hh +++ b/Watchdog/src/Threshold_Watcher.defs.hh @@ -28,16 +28,18 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "Pending_List.defs.hh" #include <cassert> -namespace Parma_Watchdog_Library { - //! A watchdog for thresholds exceeding. template <typename Traits> -class Threshold_Watcher { +class Parma_Watchdog_Library::Threshold_Watcher { public: template <typename Flag_Base, typename Flag> - Threshold_Watcher(const typename Traits::Delta& delta, const Flag_Base* volatile& holder, Flag& flag); + Threshold_Watcher(const typename Traits::Delta& delta, + const Flag_Base* volatile& holder, + Flag& flag); + + Threshold_Watcher(const typename Traits::Delta& delta, + void (*function)()); - Threshold_Watcher(const typename Traits::Delta& delta, void (*function)()); ~Threshold_Watcher(); private: @@ -74,8 +76,6 @@ private: }; -} // namespace Parma_Watchdog_Library - #include "Threshold_Watcher.inlines.hh" #include "Threshold_Watcher.templates.hh" diff --git a/Watchdog/src/Threshold_Watcher.templates.hh b/Watchdog/src/Threshold_Watcher.templates.hh index b902153..a133775 100644 --- a/Watchdog/src/Threshold_Watcher.templates.hh +++ b/Watchdog/src/Threshold_Watcher.templates.hh @@ -28,17 +28,17 @@ namespace Parma_Watchdog_Library { template <typename Traits> typename Threshold_Watcher<Traits>::WW_Pending_List::Iterator Threshold_Watcher<Traits>::add_threshold(typename Traits::Threshold threshold, - const Handler& handler, - bool& expired_flag) { + const Handler& handler, + bool& expired_flag) { Traits::check_function = Threshold_Watcher::check; return initialize.pending.insert(threshold, handler, expired_flag); } template <typename Traits> typename Threshold_Watcher<Traits>::WW_Pending_List::Iterator -Threshold_Watcher<Traits>::remove_threshold(typename WW_Pending_List::Iterator position) { - typename WW_Pending_List::Iterator i; - i = initialize.pending.erase(position); +Threshold_Watcher<Traits> +::remove_threshold(typename WW_Pending_List::Iterator position) { + typename WW_Pending_List::Iterator i = initialize.pending.erase(position); if (initialize.pending.empty()) Traits::check_function = 0; return i; diff --git a/Watchdog/src/Threshold_Watcher.types.hh b/Watchdog/src/Threshold_Watcher.types.hh index 69101a0..e6e7bee 100644 --- a/Watchdog/src/Threshold_Watcher.types.hh +++ b/Watchdog/src/Threshold_Watcher.types.hh @@ -13,8 +13,10 @@ PURPOSE. */ #define PWL_Threshold_Watcher_types_hh 1 namespace Parma_Watchdog_Library { + template <typename Traits> class Threshold_Watcher; -} + +} // namespace Parma_Watchdog_Library #endif // !defined(PWL_Threshold_Watcher_types_hh)

1 0

[GIT] ppl/ppl(master): Converted Weightwatch in more generic Threshold_Watcher.
by Abramo Bagnara 11 Jul '09

11 Jul '09

Module: ppl/ppl Branch: master Commit: 133d39ca584c6c1c9266dfe3621a677fb03ea558 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=133d39ca584c… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sat Jul 11 20:12:09 2009 +0200 Converted Weightwatch in more generic Threshold_Watcher. --- Watchdog/src/Makefile.am | 10 ++-- Watchdog/src/Pending_List.defs.hh | 12 +++--- Watchdog/src/Pending_List.inlines.hh | 30 ++++++------ Watchdog/src/Pending_List.templates.hh | 24 +++++----- Watchdog/src/Pending_List.types.hh | 2 +- .../src/{Weightwatch.cc => Threshold_Watcher.cc} | 14 +----- ...ightwatch.defs.hh => Threshold_Watcher.defs.hh} | 40 ++++++++--------- ...tch.inlines.hh => Threshold_Watcher.inlines.hh} | 28 +++++++----- ...templates.hh => Threshold_Watcher.templates.hh} | 46 +++++++++----------- ...htwatch.types.hh => Threshold_Watcher.types.hh} | 10 ++-- Watchdog/src/Watchdog.defs.hh | 9 +++- 11 files changed, 109 insertions(+), 116 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=133d39ca…

1 0

[GIT] ppl/ppl(master): Fixed typo.
by Abramo Bagnara 11 Jul '09

11 Jul '09

Module: ppl/ppl Branch: master Commit: 6fd8437f2e56f1f162c6367fef0c57b3f4bc846d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6fd8437f2e56… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sat Jul 11 18:25:10 2009 +0200 Fixed typo. --- Watchdog/src/Weightwatch.inlines.hh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Watchdog/src/Weightwatch.inlines.hh b/Watchdog/src/Weightwatch.inlines.hh index b0816c8..43e3294 100644 --- a/Watchdog/src/Weightwatch.inlines.hh +++ b/Watchdog/src/Weightwatch.inlines.hh @@ -34,7 +34,7 @@ template <typename Flag_Base, typename Flag> Weightwatch<Threshold, Get, Compare>::Weightwatch(const Threshold& threshold, const Flag_Base* volatile& holder, Flag& flag) : expired(false), handler(*new Handler_Flag<Flag_Base, Flag>(holder, flag)) { - if (!Compare()(threshold, Get()())) + if (!Compare()(Get()(), threshold)) throw std::invalid_argument("Weightwatch constructor called with a" " threshold already reached"); pending_position = add_threshold(threshold, handler, expired); @@ -44,7 +44,7 @@ template <typename Threshold, typename Get, typename Compare> inline Weightwatch<Threshold, Get, Compare>::Weightwatch(const Threshold& threshold, void (*function)()) : expired(false), handler(*new Handler_Function(function)) { - if (!Compare()(threshold, Get()())) + if (!Compare()(Get()(), threshold)) throw std::invalid_argument("Weightwatch constructor called with a" " threshold already reached"); pending_position = add_threshold(threshold, handler, expired);

1 0