February 2012 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Added '&' prefix to function identifiers that are not used to call the function.
by Patricia Hill 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: bd2ce77bf9d603c397578ad077ef4d1a30f2afee URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bd2ce77bf9d6… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Feb 21 11:29:58 2012 +0000 Added '&' prefix to function identifiers that are not used to call the function. Detected by Eclair service funcalls. --- demos/ppl_lcdd/ppl_lcdd.cc | 2 +- src/Init.cc | 2 +- src/Watchdog.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index a4ebc92..d6f1b8e 100644 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -1192,7 +1192,7 @@ main(int argc, char* argv[]) try { #ifdef PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME if (max_seconds_of_cpu_time > 0) - set_alarm_on_cpu_time(max_seconds_of_cpu_time, timeout); + set_alarm_on_cpu_time(max_seconds_of_cpu_time, &timeout); #endif // defined(PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME) diff --git a/src/Init.cc b/src/Init.cc index 7b9c53f..8997598 100644 --- a/src/Init.cc +++ b/src/Init.cc @@ -140,7 +140,7 @@ PPL::Init::Init() { // ... the GMP memory allocation functions are set, ... ppl_set_GMP_memory_allocation_functions(); // ... the default output function for Variable objects is set, ... - Variable::set_output_function(Variable::default_output_function); + Variable::set_output_function(&Variable::default_output_function); // ... the Coefficient constants are initialized, ... Coefficient_constants_initialize(); // ... the Linear_Expression class is initialized, ... diff --git a/src/Watchdog.cc b/src/Watchdog.cc index 4651d63..504beee 100644 --- a/src/Watchdog.cc +++ b/src/Watchdog.cc @@ -237,7 +237,7 @@ PPL::Watchdog::initialize() { sigemptyset(&mask); struct sigaction s; - s.sa_handler = PPL_handle_timeout; + s.sa_handler = &PPL_handle_timeout; s.sa_mask = mask; s.sa_flags = 0; // Was SA_ONESHOT: why?

2 1

[GIT] ppl/ppl(master): When object is not used for control, declaration moved outside for statement.
by Patricia Hill 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: 36a7eb86bbe88a5bd278495b3bfd435422245530 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=36a7eb86bbe8… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Feb 21 11:01:14 2012 +0000 When object is not used for control, declaration moved outside for statement. --- src/PIP_Tree.cc | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 41ea946..77bd698 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -138,7 +138,7 @@ merge_assign(Matrix& x, const Constraint_System& y, if (inhomogeneous_term != 0) itr = x_i.insert(0, inhomogeneous_term); // itr may still be end() but it can still be used as a hint. - for ( dimension_type j = 1; pj != param_end; ++pj, ++j) { + for (dimension_type j = 1; pj != param_end; ++pj, ++j) { Variable vj(*pj); if (vj.space_dimension() > cs_space_dim) break; @@ -1133,12 +1133,13 @@ PIP_Tree_Node // Needed to avoid reallocations in expr when iterating upward. add_mul_assign(expr, 0, Variable(*(parameters.rbegin()))); // The number of increments of j plus one. + dimension_type j_index = 1; Row::const_iterator i = row.begin(); Row::const_iterator i_end = row.end(); if (i != i_end && i.index() == 0) ++i; // NOTE: iterating in [1..num_params]. - for (dimension_type j_index = 1; i != i_end; ++i) { + for ( ; i != i_end; ++i) { PPL_ASSERT(i.index() <= parameters.size()); std::advance(j, i.index() - j_index); j_index = i.index(); @@ -3200,7 +3201,8 @@ PIP_Solution_Node::generate_cut(const dimension_type index, // To avoid reallocations of expr. add_mul_assign(expr, 0, Variable(*(parameters.rbegin()))); Variables_Set::const_iterator p_j = parameters.begin(); - for ( dimension_type last_index = 1; j != j_end; ++j) { + dimension_type last_index = 1; + for ( ; j != j_end; ++j) { pos_mod_assign(mod, *j, denom); if (mod != 0) { // Optimizing computation: expr += (denom - mod) * Variable(*p_j);

1 0

[GIT] ppl/ppl(master): Declarations that can be moved into a smaller scope have been moved.
by Patricia Hill 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: 1742962f7d14843cd437b9c4294468aa74e543f1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1742962f7d14… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Feb 21 08:20:09 2012 +0000 Declarations that can be moved into a smaller scope have been moved. Detected by ECLAIR service minscope. --- src/PIP_Tree.cc | 11 ++++------- src/Partially_Reduced_Product.templates.hh | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index ae86937..41ea946 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -134,12 +134,11 @@ merge_assign(Matrix& x, const Constraint_System& y, Coefficient_traits::const_reference inhomogeneous_term = y_i->inhomogeneous_term(); Variables_Set::const_iterator pj = param_begin; - dimension_type j = 1; Row::iterator itr = x_i.end(); if (inhomogeneous_term != 0) itr = x_i.insert(0, inhomogeneous_term); // itr may still be end() but it can still be used as a hint. - for ( ; pj != param_end; ++pj, ++j) { + for ( dimension_type j = 1; pj != param_end; ++pj, ++j) { Variable vj(*pj); if (vj.space_dimension() > cs_space_dim) break; @@ -1134,13 +1133,12 @@ PIP_Tree_Node // Needed to avoid reallocations in expr when iterating upward. add_mul_assign(expr, 0, Variable(*(parameters.rbegin()))); // The number of increments of j plus one. - dimension_type j_index = 1; Row::const_iterator i = row.begin(); Row::const_iterator i_end = row.end(); if (i != i_end && i.index() == 0) ++i; // NOTE: iterating in [1..num_params]. - for ( ; i != i_end; ++i) { + for (dimension_type j_index = 1; i != i_end; ++i) { PPL_ASSERT(i.index() <= parameters.size()); std::advance(j, i.index() - j_index); j_index = i.index(); @@ -3178,10 +3176,10 @@ PIP_Solution_Node::generate_cut(const dimension_type index, // Column index of already existing Artificial_Parameter. dimension_type ap_column = not_a_dimension(); - bool reuse_ap = false; if (generate_parametric_cut) { // Fractional parameter coefficient found: generate parametric cut. + bool reuse_ap = false; Linear_Expression expr; // Limiting the scope of reference row_t (may be later invalidated). @@ -3202,8 +3200,7 @@ PIP_Solution_Node::generate_cut(const dimension_type index, // To avoid reallocations of expr. add_mul_assign(expr, 0, Variable(*(parameters.rbegin()))); Variables_Set::const_iterator p_j = parameters.begin(); - dimension_type last_index = 1; - for ( ; j != j_end; ++j) { + for ( dimension_type last_index = 1; j != j_end; ++j) { pos_mod_assign(mod, *j, denom); if (mod != 0) { // Optimizing computation: expr += (denom - mod) * Variable(*p_j); diff --git a/src/Partially_Reduced_Product.templates.hh b/src/Partially_Reduced_Product.templates.hh index 313ed8a..7e5b738 100644 --- a/src/Partially_Reduced_Product.templates.hh +++ b/src/Partially_Reduced_Product.templates.hh @@ -520,8 +520,8 @@ bool shrink_to_congruence_no_check(D1& d1, D2& d2, const Congruence& cg) { bool max_included; PPL_DIRTY_TEMP_COEFFICIENT(min_numer); PPL_DIRTY_TEMP_COEFFICIENT(min_denom); - bool min_included; if (d2.maximize(e, max_numer, max_denom, max_included)) { + bool min_included; if (d2.minimize(e, min_numer, min_denom, min_included)) { // Adjust values to allow for the denominators max_denom and min_denom. max_numer *= min_denom;

1 0

[GIT] ppl/ppl(master): Simplified.
by Roberto Bagnara 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: a00acbd1037dc7da2fff39884f185b06f2e2dabd URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a00acbd1037d… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Feb 21 09:17:14 2012 +0100 Simplified. --- utils/text2cxxarray.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/utils/text2cxxarray.in b/utils/text2cxxarray.in index 4b2ea23..571e791 100644 --- a/utils/text2cxxarray.in +++ b/utils/text2cxxarray.in @@ -56,7 +56,7 @@ GetOptions( my @lines = <>; my $size = @lines + 1; -print "extern const char* const $array_name" . "[$size]"; +print "extern const char* const ${array_name}[$size]"; if (! $decl_only) { print " = {\n"; @@ -70,4 +70,5 @@ if (! $decl_only) { print " 0"; print "}"; } + print ";\n";

1 0

[GIT] ppl/ppl(master): Simplified.
by Roberto Bagnara 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: e42c3f3d8ad1a541eb102c3b4379b624e1645f9a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e42c3f3d8ad1… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Feb 21 09:15:45 2012 +0100 Simplified. --- utils/text2cxxarray.in | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/utils/text2cxxarray.in b/utils/text2cxxarray.in index b79b7b5..4b2ea23 100644 --- a/utils/text2cxxarray.in +++ b/utils/text2cxxarray.in @@ -53,12 +53,8 @@ GetOptions( 'help|h' => \&usage, ) || usage(); -@lines = <>; - -my $size = 1; -foreach (@lines) { - $size = $size+1; -} +my @lines = <>; +my $size = @lines + 1; print "extern const char* const $array_name" . "[$size]";

1 0

[GIT] ppl/ppl(master): New automatically generated files BUGS.hh, COPYING. hh and CREDITS.hh.
by Roberto Bagnara 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: 7f578f53d6ca109d5b233ffbc2cba4b593067c1a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7f578f53d6ca… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Feb 21 08:44:07 2012 +0100 New automatically generated files BUGS.hh, COPYING.hh and CREDITS.hh. --- src/Makefile.am | 21 +++++++++++++++++++++ src/ppl-config.cc.in | 15 ++++++--------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 13d83d7..6e84ad1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -577,12 +577,21 @@ ppl.hh: $(top_builddir)/ppl-config.h $(top_builddir)/src/version.hh ppl_header.h -I $(top_builddir) -I $(top_builddir)/src \ $(top_srcdir)/src/ppl_header.hh >$@ +BUGS.hh: $(top_builddir)/utils/text2cxxarray $(top_srcdir)/BUGS + $(top_builddir)/utils/text2cxxarray --name=BUGS_array --decl-only \ + $(top_srcdir)/BUGS >$@ BUGS.cc: $(top_builddir)/utils/text2cxxarray $(top_srcdir)/BUGS $(top_builddir)/utils/text2cxxarray --name=BUGS_array \ $(top_srcdir)/BUGS >$@ +COPYING.hh: $(top_builddir)/utils/text2cxxarray $(top_srcdir)/COPYING + $(top_builddir)/utils/text2cxxarray --name=COPYING_array --decl-only \ + $(top_srcdir)/COPYING >$@ COPYING.cc: $(top_builddir)/utils/text2cxxarray $(top_srcdir)/COPYING $(top_builddir)/utils/text2cxxarray --name=COPYING_array \ $(top_srcdir)/COPYING >$@ +CREDITS.hh: $(top_builddir)/utils/text2cxxarray $(top_srcdir)/CREDITS + $(top_builddir)/utils/text2cxxarray --name=CREDITS_array --decl-only \ + $(top_srcdir)/CREDITS >$@ CREDITS.cc: $(top_builddir)/utils/text2cxxarray $(top_srcdir)/CREDITS $(top_builddir)/utils/text2cxxarray --name=CREDITS_array \ $(top_srcdir)/CREDITS >$@ @@ -604,10 +613,16 @@ ppl.hh: ppl.hh.dist ppl.hh.sed $(SED) -f ppl.hh.sed $< >$@ rm -f ppl.hh.sed +BUGS.hh: BUGS.hh.dist + cp -f $< $@ BUGS.cc: BUGS.cc.dist cp -f $< $@ +COPYING.hh: COPYING.hh.dist + cp -f $< $@ COPYING.cc: COPYING.cc.dist cp -f $< $@ +CREDITS.hh: CREDITS.hh.dist + cp -f $< $@ CREDITS.cc: CREDITS.cc.dist cp -f $< $@ @@ -631,8 +646,11 @@ $(include_HEADERS) \ $(nodist_noinst_HEADERS) \ $(noinst_HEADERS) \ $(PRECOMPILED) \ +BUGS.hh \ BUGS.cc \ +COPYING.hh \ COPYING.cc \ +CREDITS.hh \ CREDITS.cc # ppl.hh is not distributed. @@ -640,8 +658,11 @@ CREDITS.cc # likewise for BUGS.cc.dist, COPYING.cc.dist and CREDITS.cc.dist. dist-hook: mv -f $(distdir)/ppl.hh $(distdir)/ppl.hh.dist + mv -f $(distdir)/BUGS.hh $(distdir)/BUGS.hh.dist mv -f $(distdir)/BUGS.cc $(distdir)/BUGS.cc.dist + mv -f $(distdir)/COPYING.hh $(distdir)/COPYING.hh.dist mv -f $(distdir)/COPYING.cc $(distdir)/COPYING.cc.dist + mv -f $(distdir)/CREDITS.hh $(distdir)/CREDITS.hh.dist mv -f $(distdir)/CREDITS.cc $(distdir)/CREDITS.cc.dist CLEANFILES = $(BUILT_SOURCES) diff --git a/src/ppl-config.cc.in b/src/ppl-config.cc.in index 0fafd39..f8c5481 100644 --- a/src/ppl-config.cc.in +++ b/src/ppl-config.cc.in @@ -23,6 +23,9 @@ For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ #include "ppl.hh" +#include "BUGS.hh" +#include "COPYING.hh" +#include "CREDITS.hh" namespace PPL = Parma_Polyhedra_Library; @@ -712,20 +715,14 @@ main(int argc, char* argv[]) try { if (required_license) portray("LICENSE", PPL_LICENSE); - if (required_copying) { - extern const char* const COPYING_array[]; + if (required_copying) portray("COPYING", COPYING_array); - } - if (required_bugs) { - extern const char* const BUGS_array[]; + if (required_bugs) portray("BUGS", BUGS_array); - } - if (required_credits) { - extern const char* const CREDITS_array[]; + if (required_credits) portray("CREDITS", CREDITS_array); - } return 0; }

1 0

[GIT] ppl/ppl(master): Explicitly state the array size. New option --decl-only.
by Roberto Bagnara 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: 1b3c2d0ceffdcf1779f57988c8490f4b238cfabe URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1b3c2d0ceffd… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Feb 21 08:42:44 2012 +0100 Explicitly state the array size. New option --decl-only. --- utils/text2cxxarray.in | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/utils/text2cxxarray.in b/utils/text2cxxarray.in index 1a26225..b79b7b5 100644 --- a/utils/text2cxxarray.in +++ b/utils/text2cxxarray.in @@ -38,25 +38,40 @@ Usage: text2cxxarray [OPTIONS] [FILE ...] [OPTIONS] --name=NAME Use NAME as the array name. + --definition Emit a defining declaration. -h, --help Display this help message. EOF exit 1; } my $array_name = "a"; +my $decl_only = 0; GetOptions( - 'name=s' => \$array_name, - 'help|h' => \&usage, + 'name=s' => \$array_name, + 'decl-only' => \$decl_only, + 'help|h' => \&usage, ) || usage(); -print "extern const char* const $array_name" . "[] = {\n"; -while (<>) { - chop; - s/\\/\\\\/g; - s/\t/\\t/g; - s/\"/\\"/g; - print " \"$_\",\n"; +@lines = <>; + +my $size = 1; +foreach (@lines) { + $size = $size+1; +} + +print "extern const char* const $array_name" . "[$size]"; + +if (! $decl_only) { + print " = {\n"; + foreach (@lines) { + chop; + s/\\/\\\\/g; + s/\t/\\t/g; + s/\"/\\"/g; + print " \"$_\",\n"; + } + print " 0"; + print "}"; } -print " 0"; -print "};\n"; +print ";\n";

1 0

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

21 Feb '12

Module: ppl/ppl Branch: master Commit: 47700f1555720a88ce2c5b5ee94517af003b9863 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=47700f155572… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Feb 21 07:11:39 2012 +0100 Unwanted inclusion removed. --- tests/MIP_Problem/mipproblem2.cc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tests/MIP_Problem/mipproblem2.cc b/tests/MIP_Problem/mipproblem2.cc index a81d6dc..3f436c5 100644 --- a/tests/MIP_Problem/mipproblem2.cc +++ b/tests/MIP_Problem/mipproblem2.cc @@ -22,7 +22,6 @@ For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ #include "ppl_test.hh" -#include "pwl.hh" #include <limits> namespace {

1 0

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

20 Feb '12

Module: ppl/ppl Branch: master Commit: 5dc399d79a0f80e096a2355f2fe4f31c7cac64f0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5dc399d79a0f… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Feb 20 23:32:50 2012 +0100 Unwanted inclusion removed. --- tests/Box/refinewithconstraints2.cc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tests/Box/refinewithconstraints2.cc b/tests/Box/refinewithconstraints2.cc index 823f0ac..39f04fb 100644 --- a/tests/Box/refinewithconstraints2.cc +++ b/tests/Box/refinewithconstraints2.cc @@ -23,7 +23,6 @@ For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ #include "ppl_test.hh" -#include "pwl.hh" #include <sstream> namespace {

1 0

[GIT] ppl/ppl(master): The Parma Watchdog Library has been merged into the Parma Polyhedra Library .
by Roberto Bagnara 20 Feb '12

20 Feb '12

Module: ppl/ppl Branch: master Commit: 9e69c60b10f80fe3babe7460589a80f2ca9368d3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9e69c60b10f8… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Feb 20 23:17:33 2012 +0100 The Parma Watchdog Library has been merged into the Parma Polyhedra Library. --- interfaces/C/ppl_c_implementation_common.cc | 40 ++-------------------- interfaces/C/ppl_c_implementation_common.defs.hh | 3 -- interfaces/Java/jni/ppl_java_common.cc | 10 +----- interfaces/Java/jni/ppl_java_common.defs.hh | 10 +---- interfaces/Java/jni/ppl_java_globals.cc | 30 +---------------- interfaces/OCaml/ppl_ocaml_common.cc | 38 ++------------------- interfaces/OCaml/ppl_ocaml_common.defs.hh | 3 -- interfaces/Prolog/ppl_prolog_common.cc | 37 +++----------------- interfaces/Prolog/ppl_prolog_common.defs.hh | 3 -- tests/Box/refinewithconstraints2.cc | 4 +- tests/MIP_Problem/mipproblem2.cc | 2 +- 11 files changed, 18 insertions(+), 162 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=9e69c60b…

1 0