March 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Include <stdlib.h> instead of <malloc.h>.
by Roberto Bagnara 28 Mar '09

28 Mar '09

Module: ppl/ppl Branch: master Commit: 19e1f7c6bb2eaf85677571d04e09ce1d1a8ea1f4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=19e1f7c6bb2e… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 28 08:10:18 2009 +0100 Include <stdlib.h> instead of <malloc.h>. --- interfaces/C/tests/print_to_buffer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/C/tests/print_to_buffer.c b/interfaces/C/tests/print_to_buffer.c index 70b304e..bac2557 100644 --- a/interfaces/C/tests/print_to_buffer.c +++ b/interfaces/C/tests/print_to_buffer.c @@ -1,4 +1,4 @@ -/* Declarations of print_ppl_*_to_buffer() functions. +/* Definitions of print_ppl_*_to_buffer() functions. Copyright (C) 2001-2009 Roberto Bagnara <bagnara(a)cs.unipr.it> This file is part of the Parma Polyhedra Library (PPL). @@ -22,7 +22,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "ppl_c.h" #include "print_to_buffer.h" -#include <malloc.h> +#include <stdlib.h> #include <string.h> #define DEFINE_PRINT_TO_BUFFER(Type) \

1 0

[GIT] ppl/ppl(master): Allow testing under MinGW.
by Roberto Bagnara 28 Mar '09

28 Mar '09

Module: ppl/ppl Branch: master Commit: ab28235b89551c09ac97496a0c426994da74c379 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ab28235b8955… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 28 07:46:21 2009 +0100 Allow testing under MinGW. --- demos/ppl_lpsol/Makefile.am | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/demos/ppl_lpsol/Makefile.am b/demos/ppl_lpsol/Makefile.am index 1045a0b..971597d 100644 --- a/demos/ppl_lpsol/Makefile.am +++ b/demos/ppl_lpsol/Makefile.am @@ -195,8 +195,19 @@ $(EGREP) "^Optimum value: " $(srcdir)/$(EXPECTED) \ else !HOST_OS_SOLARIS +if HOST_OS_MINGW + +DIFF_COMMAND = \ +tr -d '\015' <obtained \ +| sed -e "s/ppl_lpsol.exe/ppl_lpsol/g" -e "s/1e+012/1e+12/g" \ +| diff $(srcdir)/$(EXPECTED) - + +else !HOST_OS_MINGW + DIFF_COMMAND = diff -u $(srcdir)/$(EXPECTED) obtained +endif !HOST_OS_MINGW + endif !HOST_OS_SOLARIS endif !HOST_OS_DARWIN

1 0

[GIT] ppl/ppl(master): Detect MinGW, defining the HOST_OS_MINGW Automake conditional.
by Roberto Bagnara 28 Mar '09

28 Mar '09

Module: ppl/ppl Branch: master Commit: e3bfcc98175af386aab02a57fb2f50bc69b020f3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e3bfcc98175a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 28 07:45:04 2009 +0100 Detect MinGW, defining the HOST_OS_MINGW Automake conditional. --- configure.ac | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 1843376..343c710 100644 --- a/configure.ac +++ b/configure.ac @@ -465,6 +465,7 @@ CXXFLAGS="$COMP_FLAGS $OPT_FLAGS $CXXFLAGS" # System-dependent adjustments. cygwin=no +mingw=no darwin=no solaris=no x86_64=no @@ -496,6 +497,9 @@ cygwin) darwin*) darwin=yes ;; +mingw*) + mingw=yes + ;; solaris*) solaris=yes ;; @@ -505,6 +509,7 @@ esac AM_CONDITIONAL(HOST_OS_CYGWIN, test x$cygwin = xyes) AM_CONDITIONAL(HOST_OS_DARWIN, test x$darwin = xyes) +AM_CONDITIONAL(HOST_OS_MINGW, test x$mingw = xyes) AM_CONDITIONAL(HOST_OS_SOLARIS, test x$solaris = xyes) AM_CONDITIONAL(HOST_CPU_X86_64, test x$x86_64 = xyes)

1 0

[GIT] ppl/ppl(master): The `ppl_lpsol' program can now be built and checked with cross-compilation.
by Roberto Bagnara 27 Mar '09

27 Mar '09

Module: ppl/ppl Branch: master Commit: af7c591b491f6497c4e92114564aae6a685da7cf URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=af7c591b491f… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Mar 27 22:13:55 2009 +0100 The `ppl_lpsol' program can now be built and checked with cross-compilation. --- demos/ppl_lpsol/Makefile.am | 8 +- demos/ppl_lpsol/ppl_lpsol.1 | 3 + demos/ppl_lpsol/ppl_lpsol.c | 103 ++++++++++++++++++++++++++---- demos/ppl_lpsol/ppl_lpsol_extra_man_text | 4 + 4 files changed, 102 insertions(+), 16 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=af7c591b…

1 0

[GIT] ppl/ppl(master): Minor code readability improvements.
by Roberto Bagnara 27 Mar '09

27 Mar '09

Module: ppl/ppl Branch: master Commit: ddb928b1b124b465929fbbc31ec80b9f13252567 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ddb928b1b124… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Mar 27 21:52:40 2009 +0100 Minor code readability improvements. --- demos/ppl_lcdd/ppl_lcdd.cc | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index 19d7889..a3af359 100644 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -126,7 +126,7 @@ typedef Polyhedron* POLYHEDRON_TYPE; #if defined(PPL_HAVE_SYS_RESOURCE_H) \ && (defined(SA_ONESHOT) || defined(SA_RESETHAND)) -#define PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME +# define PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME #endif namespace { @@ -155,7 +155,7 @@ static const char* usage_string "Options:\n" #ifdef PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME " -CSECS, --max-cpu=SECS limits CPU usage to SECS seconds\n" -#endif +#endif // defined(PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME) " -RMB, --max-memory=MB limits memory usage to MB megabytes\n" " -h, --help prints this help text to stdout\n" " -oPATH, --output=PATH appends output to PATH\n" @@ -181,10 +181,8 @@ static const char* usage_string const char* program_name = 0; #ifdef PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME - unsigned long max_seconds_of_cpu_time = 0; - -#endif +#endif // defined(PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME) unsigned long max_bytes_of_virtual_memory = 0; bool print_timings = false; @@ -298,7 +296,7 @@ set_alarm_on_cpu_time(const unsigned seconds, sig_handler_type handler) { #elif defined(SA_RESETHAND) s.sa_flags = SA_RESETHAND; #else -#error "Either SA_ONESHOT or SA_RESETHAND must be defined." +# error "Either SA_ONESHOT or SA_RESETHAND must be defined." #endif if (sigaction(SIGXCPU, &s, 0) != 0) @@ -318,6 +316,7 @@ set_alarm_on_cpu_time(const unsigned seconds, sig_handler_type handler) { #endif // PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME #if PPL_HAVE_DECL_RLIMIT_AS + void limit_virtual_memory(const unsigned bytes) { struct rlimit t; @@ -331,10 +330,13 @@ limit_virtual_memory(const unsigned bytes) { fatal("setrlimit failed: %s", strerror(errno)); } } + #else + void limit_virtual_memory(unsigned) { } + #endif // !PPL_HAVE_DECL_RLIMIT_AS extern "C" void @@ -393,7 +395,7 @@ process_options(int argc, char* argv[]) { max_seconds_of_cpu_time = l; break; -#endif +#endif // defined(PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME) case 'R': l = strtol(optarg, &endptr, 10); @@ -1168,7 +1170,7 @@ main(int argc, char* argv[]) try { if (max_seconds_of_cpu_time > 0) set_alarm_on_cpu_time(max_seconds_of_cpu_time, timeout); -#endif +#endif // defined(PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME) if (max_bytes_of_virtual_memory > 0) limit_virtual_memory(max_bytes_of_virtual_memory);

1 0

[GIT] ppl/ppl(master): Comments improved.
by Roberto Bagnara 27 Mar '09

27 Mar '09

Module: ppl/ppl Branch: master Commit: a1335e6212c7fb666cacc103b15e4cf450fee7a1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a1335e6212c7… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Mar 27 21:06:22 2009 +0100 Comments improved. --- interfaces/C/ppl_c_header.h | 6 +++--- src/wrap.hh | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index 8d83312..8b64573 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -398,10 +398,10 @@ ppl_io_set_variable_output_function(ppl_io_variable_output_function_type* p); int ppl_io_get_variable_output_function(ppl_io_variable_output_function_type** pp); -/*! \brief Helper function for the wrapping of lines from C. +/*! \brief Utility function for the wrapping of lines of text. \param src - The source string holding the lines to wrap. + The source string holding the text to wrap. \param indent_depth The indentation depth. @@ -413,7 +413,7 @@ ppl_io_get_variable_output_function(ppl_io_variable_output_function_type** pp); The preferred length for all the lines but the first one. \return - The wrapped string in a mallocated buffer. + The wrapped string in a malloc-allocated buffer. */ char* ppl_io_wrap_string(const char* src, diff --git a/src/wrap.hh b/src/wrap.hh index 04e6c3b..0980885 100644 --- a/src/wrap.hh +++ b/src/wrap.hh @@ -29,7 +29,7 @@ namespace Parma_Polyhedra_Library { namespace IO_Operators { -//! Helper function for the wrapping of lines. +//! Utility function for the wrapping of lines of text. /*! \param src_string The source string holding the lines to wrap. @@ -52,7 +52,6 @@ wrap_string(const std::string& src_string, unsigned preferred_first_line_length, unsigned preferred_line_length); - } // namespace IO_Operators } // namespace Parma_Polyhedra_Library

1 0

[GIT] ppl/ppl(master): Get rid of pretty_printing stuff. A string wrapping function is made
by Abramo Bagnara 27 Mar '09

27 Mar '09

Module: ppl/ppl Branch: master Commit: 4bbd3ca34d382cab896a3ea43bd9fdb1d1df2df2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4bbd3ca34d38… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri Mar 27 17:22:08 2009 +0100 Get rid of pretty_printing stuff. A string wrapping function is made available. --- interfaces/C/Makefile.am | 6 +- interfaces/C/ppl_c_header.h | 34 ++- interfaces/C/ppl_c_implementation_common.cc | 12 +- interfaces/C/ppl_c_implementation_common.defs.hh | 12 - interfaces/C/ppl_c_stream.cc | 109 -------- interfaces/C/ppl_c_stream.defs.hh | 39 --- interfaces/C/ppl_c_stream.h | 70 ----- interfaces/C/ppl_c_stream.inlines.hh | 42 --- interfaces/C/ppl_interface_generator_c_cc_code.m4 | 1 - interfaces/C/ppl_interface_generator_c_h_code.m4 | 1 - interfaces/C/tests/formatted_output.c | 2 + interfaces/C/tests/print_to_buffer.c | 68 +---- ...ppl_interface_generator_java_classes_cc_code.m4 | 31 -- interfaces/Java/jni/ppl_java_globals.cc | 251 ----------------- .../Java/parma_polyhedra_library/Congruence.java | 16 - .../parma_polyhedra_library/Congruence_System.java | 16 - .../Java/parma_polyhedra_library/Constraint.java | 16 - .../parma_polyhedra_library/Constraint_System.java | 16 - .../Java/parma_polyhedra_library/Generator.java | 16 - .../parma_polyhedra_library/Generator_System.java | 16 - .../parma_polyhedra_library/Grid_Generator.java | 16 - .../Grid_Generator_System.java | 16 - .../parma_polyhedra_library/Linear_Expression.java | 16 - .../Java/parma_polyhedra_library/MIP_Problem.java | 16 - ...l_interface_generator_java_classes_java_code.m4 | 20 -- interfaces/OCaml/OCaml_interface.dox | 20 -- .../OCaml/ppl_interface_generator_ocaml_cc_code.m4 | 27 -- .../OCaml/ppl_interface_generator_ocaml_ml_code.m4 | 8 - .../ppl_interface_generator_ocaml_mli_code.m4 | 8 - interfaces/OCaml/ppl_ocaml_common.cc | 24 -- interfaces/OCaml/ppl_ocaml_globals.ml | 4 - interfaces/OCaml/ppl_ocaml_globals.mli | 3 - .../ppl_interface_generator_prolog_cc_code.m4 | 31 -- .../ppl_interface_generator_prolog_hh_code.m4 | 11 - ...erface_generator_prolog_procedure_generators.m4 | 3 +- interfaces/Prolog/ppl_prolog_common.cc | 30 -- interfaces/Prolog/ppl_prolog_common.defs.hh | 8 - ...erface_generator_common_procedure_generators.m4 | 1 - src/Makefile.am | 10 +- src/c_streambuf_format.cc | 294 -------------------- src/c_streambuf_format.defs.hh | 62 ---- src/c_streambuf_format.types.hh | 21 -- src/c_streambuf_format_settings.h | 88 ------ src/pretty_print.cc | 245 ---------------- src/pretty_print.hh | 172 ------------ src/pretty_print.inlines.hh | 92 ------ src/wrap.cc | 92 ++++++ src/{c_streambuf_format.inlines.hh => wrap.hh} | 44 +++- 48 files changed, 178 insertions(+), 1978 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=4bbd3ca3…

3 3

[GIT] ppl/ppl(master): A couple of minor corrections.
by Enea Zaffanella 27 Mar '09

27 Mar '09

Module: ppl/ppl Branch: master Commit: e0316d45f420c4c2fa5e0720ffb5b6faa89f2437 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e0316d45f420… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Mar 27 19:50:25 2009 +0100 A couple of minor corrections. --- interfaces/C/ppl_c_header.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index 4d50c32..8d83312 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -25,7 +25,7 @@ site: http://www.cs.unipr.it/ppl/ . */ /*! \defgroup PPL_C_interface C Language Interface - \brief + The Parma Polyhedra Library comes equipped with an interface for the C language. */ @@ -366,7 +366,7 @@ ppl_io_print_variable PPL_PROTO((ppl_dimension_type var)); int ppl_io_fprint_variable PPL_PROTO((FILE* stream, ppl_dimension_type var)); -/*! \relates ppl_Polyhedron_tag \brief +/*! \brief Pretty-prints \p var to a malloc-allocated string, a pointer to which is returned via \p strp. */

1 0

[GIT] ppl/ppl(master): Fixed parameter name.
by Abramo Bagnara 27 Mar '09

27 Mar '09

Module: ppl/ppl Branch: master Commit: 1c54369ebf2a32b54f3fa1eb8d6d10520aa2ff7b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1c54369ebf2a… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri Mar 27 18:54:57 2009 +0100 Fixed parameter name. --- interfaces/C/ppl_c_header.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index 45a69d1..4d50c32 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -400,7 +400,7 @@ ppl_io_get_variable_output_function(ppl_io_variable_output_function_type** pp); /*! \brief Helper function for the wrapping of lines from C. - \param src_string + \param src The source string holding the lines to wrap. \param indent_depth

1 0

[GIT] ppl/ppl(master): Moved ppl_io_wrap_string documentation.
by Abramo Bagnara 27 Mar '09

27 Mar '09

Module: ppl/ppl Branch: master Commit: 94987fdd7ee4fba86268b2b165b0196a6d01b8ce URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=94987fdd7ee4… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri Mar 27 18:51:30 2009 +0100 Moved ppl_io_wrap_string documentation. --- interfaces/C/ppl_c_header.h | 46 +++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index 90eee9a..45a69d1 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -398,6 +398,29 @@ ppl_io_set_variable_output_function(ppl_io_variable_output_function_type* p); int ppl_io_get_variable_output_function(ppl_io_variable_output_function_type** pp); +/*! \brief Helper function for the wrapping of lines from C. + + \param src_string + The source string holding the lines to wrap. + + \param indent_depth + The indentation depth. + + \param preferred_first_line_length + The preferred length for the first line of text. + + \param preferred_line_length + The preferred length for all the lines but the first one. + + \return + The wrapped string in a mallocated buffer. +*/ +char* +ppl_io_wrap_string(const char* src, + unsigned indent_depth, + unsigned preferred_first_line_length, + unsigned preferred_line_length); + /*@}*/ /* Datatypes */ #undef PPL_TYPE_DECLARATION @@ -578,29 +601,6 @@ ppl_io_fprint_##Type PPL_PROTO((FILE* stream, ppl_const_##Type##_t x)); \ int \ ppl_io_asprint_##Type PPL_PROTO((char** strp, ppl_const_##Type##_t x)); -/*! Helper function for the wrapping of lines from C. - - \param src_string - The source string holding the lines to wrap. - - \param indent_depth - The indentation depth. - - \param preferred_first_line_length - The preferred length for the first line of text. - - \param preferred_line_length - The preferred length for all the lines but the first one. - - \return - The wrapped string in a mallocated buffer. -*/ -char* -ppl_io_wrap_string(const char* src, - unsigned indent_depth, - unsigned preferred_first_line_length, - unsigned preferred_line_length); - #define PPL_DECLARE_ASCII_DUMP_LOAD_FUNCTIONS(Type) \ /*! \relates ppl_##Type##_tag */ \ int \

1 0