parallel: Code cleanup. Passes local testsuite.

src/parallel

@@ -33,7 +33,6 @@ use Getopt::Long;
 # Used to ensure code quality
 use strict;
 
-$::oodebug=0;
 $SIG{TERM} ||= sub { exit 0; }; # $SIG{TERM} is not set on Mac OS X
 if(not $ENV{SHELL}) {
     # $ENV{SHELL} is sometimes not set on Mac OS X and Windows
@@ -646,7 +645,7 @@ sub get_options_from_array {
 sub parse_options {
     # Returns: N/A
     # Defaults:
-    $Global::version = 20130429;
+    $Global::version = 20130511;
     $Global::progname = 'parallel';
     $Global::infinity = 2**31;
     $Global::debug = 0;
@@ -761,7 +760,12 @@ sub parse_options {
     }
     if($opt::tollef and not $opt::gnu and not $opt::plain) {
 	# Behave like tollef parallel (from moreutils)
-	::warning("YOU ARE USING --tollef. --tollef is obsolete and will be retired 20140222.\n");
+	if($Global::version > 20140222) {
+	    ::error("--tollef has been retired. See http://lists.gnu.org/archive/html/parallel/2013-02/msg00018.html\n");
+	    ::wait_and_exit(255);
+	}
+	::warning("YOU ARE USING --tollef. IF THINGS ARE ACTING WEIRD USE --gnu.\n");
+	::warning("--tollef is obsolete and will be retired 20140222.\n");
 	::warning("See: http://lists.gnu.org/archive/html/parallel/2013-02/msg00018.html\n");
 	$opt::u = 1;
 	$Global::grouped = 0;
@@ -1304,7 +1308,12 @@ sub start_more_jobs {
     }
     do {
 	$jobs_started_this_round = 0;
+	# This will start 1 job on each --sshlogin (if possible)
+	# thus distribute the jobs on the --sshlogins round robin
 	for my $sshlogin (values %Global::host) {
+	    if($Global::JobQueue->empty() and not $opt::pipe) {
+		last;
+	    }
 	    debug("Running jobs before on ".$sshlogin->string().": ".$sshlogin->jobs_running()."\n");
 	    if ($sshlogin->jobs_running() < $sshlogin->max_jobs_running()) {
 		if($opt::load and $sshlogin->loadavg_too_high()) {
@@ -1318,9 +1327,6 @@ sub start_more_jobs {
 		if($sshlogin->too_fast_remote_login()) {
 		    next;
 		}
-	    if($Global::JobQueue->empty() and not $opt::pipe) {
-		last;
-	    }
 		debug($sshlogin->string()." has ".$sshlogin->jobs_running()
 		      . " out of " . $sshlogin->max_jobs_running()
 		      . " jobs running. Start another.\n");
@@ -1329,7 +1335,6 @@ sub start_more_jobs {
 		    debug("No jobs started on ".$sshlogin->string()."\n");
 		    next;
 		}
-	    debug("Job started on ".$sshlogin->string()."\n");
 		$sshlogin->inc_jobs_running();
 		$sshlogin->set_last_login_at(::now());
 		$jobs_started++;
@@ -1645,10 +1650,6 @@ sub get_job_with_sshlogin {
     #   next job object for $sshlogin if any available
     my $sshlogin = shift;
 
-    if($::oodebug and $Global::JobQueue->empty()) {
-        Carp::confess("get_job_with_sshlogin should never be called if empty");
-    }
-
     my $job = $Global::JobQueue->get();
     if(not defined $job) {
         # No more jobs
@@ -1656,9 +1657,6 @@ sub get_job_with_sshlogin {
         return undef;
     }
 
-    if($::oodebug and not defined $job->{'commandline'}) {
-        Carp::confess("get_job_with_sshlogin job->commandline should never be empty");
-    }
     my $clean_command = $job->replaced();
     if($clean_command =~ /^\s*$/) {
         # Do not run empty lines
@@ -1673,7 +1671,6 @@ sub get_job_with_sshlogin {
        $job->failed_here()) {
         # This command with these args failed for this sshlogin
         my ($no_of_failed_sshlogins,$min_failures) = $job->min_failed();
-        #::my_dump(($no_of_failed_sshlogins,$min_failures));
         if($no_of_failed_sshlogins == keys %Global::host and
            $job->failed_here() == $min_failures) {
             # It failed the same or more times on another host:
@@ -4761,11 +4758,6 @@ sub replaced {
 		::shell_quote_scalar(::shell_quote_scalar($self->{'replaced'}));
 	}
     }
-    if($::oodebug and length($self->{'replaced'}) != ($self->len())) {
-	::my_dump($self);
-	Carp::cluck("replaced len=" . length($self->{'replaced'})
-		    . " computed=" . ($self->len()));
-    }
     return $self->{'replaced'};
 }
 
@@ -5255,10 +5247,6 @@ sub new {
     my $fhs = shift;
     for my $fh (@$fhs) {
 	if(-t $fh) {
-	    if($opt::tollef and not $opt::gnu) {
-		::warning("YOU ARE USING --tollef. "
-			  . "IF THINGS ARE ACTING WEIRD USE --gnu.");
-	    }
 	    ::warning("Input is read from the terminal. ".
 		      "Only experts do this on purpose. ".
 		      "Press CTRL-D to exit.\n");
@@ -5482,9 +5470,6 @@ package Arg;
 sub new {
     my $class = shift;
     my $orig = shift;
-    if($::oodebug and not defined $orig) {
-	Carp::cluck($orig);
-    }
     return bless {
 	'orig' => $orig,
     }, ref($class) || $class;

testsuite/tests-to-run/parallel-local18.sh

@@ -36,10 +36,10 @@ parallel -S csh@localhost --env SPC echo 'a"$SPC"b' ::: 5
 parallel -S tcsh@localhost --env SPC echo 'a"$SPC"b' ::: 5
 
 echo '### Test --env for \n and \\ - single and double - no output is good'
-perl -e 'for(10,92) { printf "%c%c %c%d\0",$_,$_,$_,$_ }' | stdout parallel --nice 19 -j4 -k -I // --arg-sep _ -0 V=// V2=V2=// parallel -k -j1 -S :,1/lo,1/tcsh@lo,1/csh@lo --env V,V2 echo \''"{}$V$V2"'\' ::: {#} {#} {#} {#} | uniq -c | grep -v '   4 '|grep -v xauth |grep -v X11
+perl -e 'for(10,92) { printf "%c%c %c%d\0",$_,$_,$_,$_ }' | stdout parallel --nice 19 -j4 -k -I // --arg-sep _ -0 V=// V2=V2=// parallel -k -j1 -S :,1/lo,1/tcsh@lo,1/csh@lo --env V,V2 echo \''"{}$V$V2"'\' ::: {#} {#} {#} {#} | sort | uniq -c | grep -v '   4 '|grep -v xauth |grep -v X11
 
 echo '### Test --env for \n and \\ - single and double --onall - no output is good'
-perl -e 'for(10,92) { printf "%c%c %c%d\0",$_,$_,$_,$_ }' | stdout parallel --nice 19 -j4 -k -I // --arg-sep _ -0 V=// V2=V2=// parallel -k -j1 -S :,1/lo,1/tcsh@lo,1/csh@lo --onall --env V,V2 echo \''"{}$V$V2"'\' ::: {#} | uniq -c | grep -v '   4 '|grep -v xauth |grep -v X11
+perl -e 'for(10,92) { printf "%c%c %c%d\0",$_,$_,$_,$_ }' | stdout parallel --nice 19 -j4 -k -I // --arg-sep _ -0 V=// V2=V2=// parallel -k -j1 -S :,1/lo,1/tcsh@lo,1/csh@lo --onall --env V,V2 echo \''"{}$V$V2"'\' ::: {#} | sort | uniq -c | grep -v '   4 '|grep -v xauth |grep -v X11
 
 echo '### Test --env for \160 - which kills csh - single and double - no output is good'
 perl -e 'for(160) { printf "%c%c %c%d\0",$_,$_,$_,$_ }' | stdout parallel --nice 19 -j4 -k -I // --arg-sep _ -0 V=// V2=V2=// parallel -k -j1 -S :,1/lo,1/tcsh@lo --env V,V2 echo \''"{}$V$V2"'\' ::: {#} {#} {#} | uniq -c | grep -v '   3 '|grep -v xauth |grep -v X11

testsuite/wanted-results/parallel-local164

@@ -91,8 +91,9 @@ one 1
 a
 b
 c
+parallel: Warning: --tollef is obsolete and will be retired 20140222.
 parallel: Warning: See: http://lists.gnu.org/archive/html/parallel/2013-02/msg00018.html
-parallel: Warning: YOU ARE USING --tollef. --tollef is obsolete and will be retired 20140222.
+parallel: Warning: YOU ARE USING --tollef. IF THINGS ARE ACTING WEIRD USE --gnu.
 ### Test --tollef --gnu
 1
 2

testsuite/wanted-results/parallel-local18

@@ -25,18 +25,18 @@ a'   * ? >o  <i*? ][\!#¤%=( ) | }b 5
 a'   * ? >o  <i*? ][\!#¤%=( ) | }b 5
 a'   * ? >o  <i*? ][\!#¤%=( ) | }b 5
 ### Test --env for \n and \\ - single and double - no output is good
-      2 setenv: Too many arguments.
-      1 export: Command not found.
-      1 V: Undefined variable.
       2 1 10V2= 10
-      3 2\\ \92V2=\\ \92
       1 2\ \92V2=\ \92
+      3 2\\ \92V2=\\ \92
+      1 V: Undefined variable.
+      1 export: Command not found.
+      2 setenv: Too many arguments.
 ### Test --env for \n and \\ - single and double --onall - no output is good
-      2 setenv: Too many arguments.
-      1 export: Command not found.
-      1 V: Undefined variable.
       2 1 10V2= 10
-      3 2\\ \92V2=\\ \92
       1 2\ \92V2=\ \92
+      3 2\\ \92V2=\\ \92
+      1 V: Undefined variable.
+      1 export: Command not found.
+      2 setenv: Too many arguments.
 ### Test --env for \160 - which kills csh - single and double - no output is good
 ### Test --env for \160  - which kills csh - single and double --onall - no output is good