diff --git a/src/parallel.pdf b/src/parallel.pdf index 46c8edba..e18bd263 100644 Binary files a/src/parallel.pdf and b/src/parallel.pdf differ diff --git a/src/parallel.pod b/src/parallel.pod index 067e049b..7f4f2add 100644 --- a/src/parallel.pod +++ b/src/parallel.pod @@ -168,7 +168,7 @@ The replacement string B<{#}> can be changed with B<--seqreplace>. To understand replacement strings see B<{}>. -=item B<{%}> (alpha) +=item B<{%}> (alpha testing) Job slot number. This replacement string will be replaced by the job's slot number between 1 and number of jobs to run in parallel. There @@ -1500,7 +1500,7 @@ The sshloginfile '-' is special, too, it read sshlogins from stdin (standard input). -=item B<--slotreplace> I +=item B<--slotreplace> I (alpha testing) Use the replacement string I instead of B<{%}> for job slot number. diff --git a/src/parallel.texi b/src/parallel.texi index 725110f6..c165be59 100644 --- a/src/parallel.texi +++ b/src/parallel.texi @@ -244,8 +244,8 @@ The replacement string @strong{@{#@}} can be changed with @strong{--seqreplace}. To understand replacement strings see @strong{@{@}}. -@item @strong{@{%@}} (alpha) -@anchor{@strong{@{%@}} (alpha)} +@item @strong{@{%@}} (alpha testing) +@anchor{@strong{@{%@}} (alpha testing)} Job slot number. This replacement string will be replaced by the job's slot number between 1 and number of jobs to run in parallel. There @@ -1671,8 +1671,8 @@ The sshloginfile '.' is special, it read sshlogins from The sshloginfile '-' is special, too, it read sshlogins from stdin (standard input). -@item @strong{--slotreplace} @emph{replace-str} -@anchor{@strong{--slotreplace} @emph{replace-str}} +@item @strong{--slotreplace} @emph{replace-str} (alpha testing) +@anchor{@strong{--slotreplace} @emph{replace-str} (alpha testing)} Use the replacement string @emph{replace-str} instead of @strong{@{%@}} for job slot number. diff --git a/src/parallel_tutorial.1 b/src/parallel_tutorial.1 index 050d00c0..1d24ab9f 100644 --- a/src/parallel_tutorial.1 +++ b/src/parallel_tutorial.1 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "PARALLEL_TUTORIAL 1" -.TH PARALLEL_TUTORIAL 1 "2014-05-31" "20140522" "parallel" +.TH PARALLEL_TUTORIAL 1 "2014-06-04" "20140522" "parallel" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -140,8 +140,8 @@ love you for it. .SH "Prerequisites" .IX Header "Prerequisites" To run this tutorial you must have the following: -.IP "parallel >= version 20130814" 9 -.IX Item "parallel >= version 20130814" +.IP "parallel >= version 20140622" 9 +.IX Item "parallel >= version 20140622" Install the newest version with: .Sp .Vb 1 @@ -483,8 +483,8 @@ Output (the order may be different): .Ve .SS "Replacement strings" .IX Subsection "Replacement strings" -\fIThe 6 replacement strings\fR -.IX Subsection "The 6 replacement strings" +\fIThe 7 replacement strings\fR +.IX Subsection "The 7 replacement strings" .PP \&\s-1GNU\s0 Parallel has several replacement strings. If no replacement strings are used the default is to append {}: @@ -1137,7 +1137,7 @@ Output: with half a line of another job. That has happend in the second line, where the line '4\-middle' is mixed with '2\-start'. .PP -To avoid this use \-\-linebuffer (which, however, is much slower): +To avoid this use \-\-linebuffer: .PP .Vb 1 \& parallel \-j2 \-\-linebuffer \*(Aqprintf "%s\-start\en%s" {} {};sleep {};printf "%s\en" \-middle;echo {}\-end\*(Aq ::: 4 2 1 @@ -2675,4 +2675,4 @@ If \s-1GNU\s0 Parallel saves you money: .IP "\(bu" 2 (Have your company) donate to \s-1FSF\s0 https://my.fsf.org/donate/ .PP -(C) 20130822 Ole Tange GPLv3 +(C) 20140622 Ole Tange GPLv3 diff --git a/src/parallel_tutorial.html b/src/parallel_tutorial.html index 11dab734..b4bb5357 100644 --- a/src/parallel_tutorial.html +++ b/src/parallel_tutorial.html @@ -41,7 +41,7 @@
  • Replacement strings
  • Changing the replacement strings
  • @@ -128,7 +128,7 @@ love you for it.

    Prerequisites

    To run this tutorial you must have the following:

    -
    parallel >= version 20130814
    +
    parallel >= version 20140622

    Install the newest version with:

    @@ -390,7 +390,7 @@ exported using 'export -f':

    Replacement strings

    -

    The 6 replacement strings

    +

    The 7 replacement strings

    GNU Parallel has several replacement strings. If no replacement strings are used the default is to append {}:

    @@ -785,7 +785,7 @@ total of 5 jobs:

    --ungroup is fast, but can cause half a line from one job to be mixed with half a line of another job. That has happend in the second line, where the line '4-middle' is mixed with '2-start'.

    -

    To avoid this use --linebuffer (which, however, is much slower):

    +

    To avoid this use --linebuffer:

       parallel -j2 --linebuffer 'printf "%s-start\n%s" {} {};sleep {};printf "%s\n" -middle;echo {}-end' ::: 4 2 1

    Output:

    @@ -1903,7 +1903,7 @@ mailing lists

    (Have your company) donate to FSF https://my.fsf.org/donate/

    -

    (C) 20130822 Ole Tange GPLv3

    +

    (C) 20140622 Ole Tange GPLv3

    diff --git a/src/parallel_tutorial.pdf b/src/parallel_tutorial.pdf index b855fe22..04a3b25f 100644 Binary files a/src/parallel_tutorial.pdf and b/src/parallel_tutorial.pdf differ diff --git a/testsuite/tests-to-run/parallel-local22.sh b/testsuite/tests-to-run/parallel-local22.sh index ca19f536..5fd6967c 100755 --- a/testsuite/tests-to-run/parallel-local22.sh +++ b/testsuite/tests-to-run/parallel-local22.sh @@ -43,4 +43,7 @@ echo '### Bug before 2009-08-26 causing regexp compile error or infinite loop (I echo '### nice and tcsh and Bug #33995: Jobs executed with sh instead of $SHELL'; seq 1 2 | SHELL=tcsh MANPATH=. stdout parallel -k --nice 8 setenv a b\;echo \$SHELL +echo '### bug #42041: Implement $PARALLEL_JOBSLOT' + parallel -k --slotreplace ,, -j2 echo ,, ::: {1..4} + EOF diff --git a/testsuite/wanted-results/parallel-local22 b/testsuite/wanted-results/parallel-local22 index e43360bc..464ccae0 100644 --- a/testsuite/wanted-results/parallel-local22 +++ b/testsuite/wanted-results/parallel-local22 @@ -23,3 +23,8 @@ d7fb96d6a56d4347bc24930a395c431a - ### nice and tcsh and Bug #33995: Jobs executed with sh instead of $SHELL tcsh 1 tcsh 2 +### bug #42041: Implement $PARALLEL_JOBSLOT +1 +2 +1 +2