From b26dbadcc053eb8b535510468b372da2aa5ee4ae Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Thu, 26 Aug 2010 20:03:59 +0200 Subject: [PATCH] =?UTF-8?q?Bugfix:=20--eta/--progress=20with=200=20jobs=20?= =?UTF-8?q?gave=20division=20by=20zero.=20Bugfix=20in=20Makefile=20by=20Pi?= =?UTF-8?q?otr=20Jaroszy=C5=84ski=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- autom4te.cache/requests | 26 +++++++++++++------------- doc/FUTURE_IDEAS | 3 +++ doc/release_new_version | 28 ++-------------------------- src/Makefile.in | 6 +++--- src/parallel | 16 +++++++++------- unittest/tests-to-run/test30.sh | 6 ++++++ unittest/wanted-results/test30 | 10 ++++++++++ 7 files changed, 46 insertions(+), 49 deletions(-) diff --git a/autom4te.cache/requests b/autom4te.cache/requests index 8e58b38e..0cc71478 100644 --- a/autom4te.cache/requests +++ b/autom4te.cache/requests @@ -64,8 +64,8 @@ 'AM_SET_LEADING_DOT' => 1, 'AM_SET_DEPDIR' => 1, '_AM_DEPENDENCIES' => 1, - 'm4_include' => 1, 'AM_PROG_INSTALL_SH' => 1, + 'm4_include' => 1, '_AC_AM_CONFIG_HEADER_HOOK' => 1, 'AU_DEFUN' => 1, 'AM_MAKE_INCLUDE' => 1 @@ -83,25 +83,25 @@ 'configure.ac' ], { - 'AM_PROG_F77_C_O' => 1, '_LT_AC_TAGCONFIG' => 1, - 'AC_INIT' => 1, + 'AM_PROG_F77_C_O' => 1, 'm4_pattern_forbid' => 1, - 'AC_CANONICAL_TARGET' => 1, + 'AC_INIT' => 1, '_AM_COND_IF' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AC_CANONICAL_TARGET' => 1, 'AC_SUBST' => 1, - 'AC_CANONICAL_HOST' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, 'AC_FC_SRCEXT' => 1, + 'AC_CANONICAL_HOST' => 1, 'AC_PROG_LIBTOOL' => 1, 'AM_INIT_AUTOMAKE' => 1, 'AC_CONFIG_SUBDIRS' => 1, 'AM_AUTOMAKE_VERSION' => 1, 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_CONFIG_LINKS' => 1, 'AC_REQUIRE_AUX_FILE' => 1, - 'LT_SUPPORTED_TAG' => 1, + 'AC_CONFIG_LINKS' => 1, 'm4_sinclude' => 1, + 'LT_SUPPORTED_TAG' => 1, 'AM_MAINTAINER_MODE' => 1, 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, '_m4_warn' => 1, @@ -114,17 +114,17 @@ 'include' => 1, 'AM_GNU_GETTEXT' => 1, 'AC_LIBSOURCE' => 1, - 'AC_CANONICAL_BUILD' => 1, 'AM_PROG_FC_C_O' => 1, + 'AC_CANONICAL_BUILD' => 1, 'AC_FC_FREEFORM' => 1, 'AH_OUTPUT' => 1, - 'AC_CONFIG_AUX_DIR' => 1, '_AM_SUBST_NOTMAKE' => 1, - 'AM_PROG_CC_C_O' => 1, - 'm4_pattern_allow' => 1, + 'AC_CONFIG_AUX_DIR' => 1, 'sinclude' => 1, - 'AM_CONDITIONAL' => 1, + 'm4_pattern_allow' => 1, + 'AM_PROG_CC_C_O' => 1, 'AC_CANONICAL_SYSTEM' => 1, + 'AM_CONDITIONAL' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, 'm4_include' => 1, diff --git a/doc/FUTURE_IDEAS b/doc/FUTURE_IDEAS index 03792f0c..6f2aca0c 100644 --- a/doc/FUTURE_IDEAS +++ b/doc/FUTURE_IDEAS @@ -1,3 +1,6 @@ +Bugfix: --eta/--progress with 0 jobs gave division by zero. +Bugfix in Makefile by Piotr Jaroszyński

+ fex syntax for splitting fields http://www.semicomplete.com/projects/fex/ sql :foo 'select * from bar' | parallel --fex '|{1,2}' do_stuff {2} {1} diff --git a/doc/release_new_version b/doc/release_new_version index ab87d8cc..9ac34da6 100644 --- a/doc/release_new_version +++ b/doc/release_new_version @@ -98,32 +98,8 @@ download at: http://ftp.gnu.org/gnu/parallel/ New in this release: -* Counting semaphore functionality: start a job in the background. If - N jobs are already running, wait for one to complete. Examples: - sem 'sleep 2; echo foo'; sem 'sleep 1; echo bar'; sem --wait - sem -j2 'sleep 2; echo foo'; sem -j2 'sleep 1; echo bar'; sem --wait - -* With --colsep a table can be used as input. Example: - cat tab_sep_table | parallel --colsep '\t' echo col1 {1} col2 {2} - -* --trim can remove white space around arguments. - -* --sshloginfile '..' means use ~/.parallel/sshloginfile - -* Zero install package. Thanks to Tim Cuthbertson - -* OpenSUSE package. Thanks to Markus Ammer - -* NixOS package. Thanks to Ludovic Courtès - -* Web review http://oentend.blogspot.com/2010/08/gnu-parallel.html - Thanks to Pavel Nuzhdin - -* Web review http://psung.blogspot.com/2010/08/gnu-parallel.html - Thanks to Phil Sung - +* First community generated bugfixes + Piotr Jaroszyński = About GNU Parallel = diff --git a/src/Makefile.in b/src/Makefile.in index 3b68be1b..e1d6f61a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -453,14 +453,14 @@ sem.1: sem.pod Makefile parallel.html: parallel Makefile pod2html $(srcdir)/parallel > $(srcdir)/parallel.html - rm $(srcdir)/pod2htm* + rm -f $(srcdir)/pod2htm* sem.html: sem.pod Makefile pod2html $(srcdir)/sem.pod > $(srcdir)/sem.html - rm $(srcdir)/pod2htm* + rm -f $(srcdir)/pod2htm* sem: parallel - ln -s parallel sem + ln -fs parallel sem # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/parallel b/src/parallel index da7df834..c2f03cbb 100755 --- a/src/parallel +++ b/src/parallel @@ -3458,13 +3458,15 @@ sub progress { $status = $eta . join(" ",map { - my $completed = ($Global::host{$_}{'completed'}||0); - my $running = $Global::host{$_}{'no_of_running'}; - my $time = $completed ? (time-$^T)/($completed) : "0"; - sprintf("%s:%d/%d/%d%%/%.1fs ", - $sshlogin{$_}, $running, $completed, - ($running+$completed)*100 - / $Global::total_started, $time); + if($Global::total_started) { + my $completed = ($Global::host{$_}{'completed'}||0); + my $running = $Global::host{$_}{'no_of_running'}; + my $time = $completed ? (time-$^T)/($completed) : "0"; + sprintf("%s:%d/%d/%d%%/%.1fs ", + $sshlogin{$_}, $running, $completed, + ($running+$completed)*100 + / $Global::total_started, $time); + } } @workers); } if(length $status > $termcols) { diff --git a/unittest/tests-to-run/test30.sh b/unittest/tests-to-run/test30.sh index 8bbe3558..9b7802bd 100644 --- a/unittest/tests-to-run/test30.sh +++ b/unittest/tests-to-run/test30.sh @@ -3,5 +3,11 @@ echo '### Test of --eta' seq 1 10 | stdout parallel --eta "sleep 1; echo {}" | wc -l +echo '### Test of --eta with no jobs' +stdout parallel --eta "sleep 1; echo {}" < /dev/null + echo '### Test of --progress' seq 1 10 | stdout parallel --progress "sleep 1; echo {}" | wc -l + +echo '### Test of --progress with no jobs' +stdout parallel --progress "sleep 1; echo {}" < /dev/null diff --git a/unittest/wanted-results/test30 b/unittest/wanted-results/test30 index c0f7b83f..a094c913 100644 --- a/unittest/wanted-results/test30 +++ b/unittest/wanted-results/test30 @@ -1,4 +1,14 @@ ### Test of --eta 16 +### Test of --eta with no jobs + +Computers / CPU cores / Max jobs to run +1:local / - / 9 + ### Test of --progress 16 +### Test of --progress with no jobs + +Computers / CPU cores / Max jobs to run +1:local / - / 9 +