diff --git a/NEWS b/NEWS index 65f20516..6a8eba2c 100644 --- a/NEWS +++ b/NEWS @@ -8,8 +8,8 @@ * --sqlworker only reads from the DBURL: any command and any arguments are ignored. -* --sqlmaster +DBURL will append commands to the DBURL and not erase - the table. +* --sqlmaster +DBURL will append different commands to the DBURL and + not erase the table. * If --results contain a replacement string, no tree structure with args will be generated. @@ -29,7 +29,7 @@ of Metric Temporal Logic http://people.inf.ethz.ch/trayteld/papers/tacas17-aerial/aerial.pdf -* 使用GNU parallel命令并行预处理数据https://blog.razrlele.com/p/1843 +* 使用GNU parallel命令并行预处理数据: https://blog.razrlele.com/p/1843 * GNU Parallel as a queuing system: http://puntoblogspot.blogspot.com/2017/01/gnu-parallel-as-queuing-system.html diff --git a/doc/release_new_version b/doc/release_new_version index 39d46b39..24be1db7 100644 --- a/doc/release_new_version +++ b/doc/release_new_version @@ -207,18 +207,6 @@ file:///home/tange/privat/parallel/doc/release_new_version from:tange@gnu.org to:parallel@gnu.org, bug-parallel@gnu.org -cc:Tim Cuthbertson , - Ludovic Courtès , Markus Ammer , - Pavel Nuzhdin , Phil Sung , - Michael Shigorin , - Chris Howey , - Fethican Coşkuner , - Rogério Brito , - Koen Vervloesem , - R. Tyler Croy , - kerick@shiftedbit.net, Christian Faulhammer , - Ryoichiro Suzuki , - Jesse Alama Subject: GNU Parallel 20170122 ('George Michael') released <<[stable]>> diff --git a/src/niceload b/src/niceload index b24ff038..30e2735e 100755 --- a/src/niceload +++ b/src/niceload @@ -24,7 +24,7 @@ use strict; use Getopt::Long; $Global::progname="niceload"; -$Global::version = 20170122; +$Global::version = 20170123; Getopt::Long::Configure("bundling","require_order"); get_options_from_array(\@ARGV) || die_usage(); if($opt::version) { diff --git a/src/parallel b/src/parallel index 49a35971..0ad5d08f 100755 --- a/src/parallel +++ b/src/parallel @@ -1269,7 +1269,7 @@ sub check_invalid_option_combinations { sub init_globals { # Defaults: - $Global::version = 20170122; + $Global::version = 20170123; $Global::progname = 'parallel'; $Global::infinity = 2**31; $Global::debug = 0; diff --git a/src/parallel.pod b/src/parallel.pod index c0581a73..5f9694c9 100644 --- a/src/parallel.pod +++ b/src/parallel.pod @@ -486,9 +486,9 @@ making it harder to finance development. However, if you pay 10000 EUR, you should feel free to use B<--will-cite> in scripts. -=item B<--block> I (beta testing) +=item B<--block> I -=item B<--block-size> I (beta testing) +=item B<--block-size> I Size of block in bytes to read at a time. The I can be postfixed with K, M, G, T, P, E, k, m, g, t, p, or e which would multiply the @@ -640,7 +640,7 @@ If I is omitted, there is no end of file string. If neither B<-E> nor B<-e> is used, no end of file string is used. -=item B<--env> I (alpha testing) +=item B<--env> I (beta testing) Copy environment variable I. This will copy I to the environment that the command is run in. This is especially useful for @@ -1448,9 +1448,9 @@ it to the command. Only used with B<--pipe>. -=item B<--results> I (alpha testing) +=item B<--results> I (beta testing) -=item B<--res> I (alpha testing) +=item B<--res> I (beta testing) Save the output into files. @@ -1702,9 +1702,9 @@ B<--return> is ignored when used with B<--sshlogin :> or when not used with B<--sshlogin>. -=item B<--round-robin> (beta testing) +=item B<--round-robin> -=item B<--round> (beta testing) +=item B<--round> Normally B<--pipe> will give a single block to each instance of the command. With B<--round-robin> all blocks will at random be written to @@ -1926,7 +1926,7 @@ when called with B<--shebang>). Use B<--sqlmaster> instead. -=item B<--sqlmaster> I (alpha testing) +=item B<--sqlmaster> I (beta testing) Submit jobs via SQL server. I must point to a table, which will contain the same information as B<--joblog>, the values from the input @@ -1965,12 +1965,12 @@ It can also be an alias from ~/.sql/aliases: :myalias mysql:///mydb/paralleljobs -=item B<--sqlandworker> I (alpha testing) +=item B<--sqlandworker> I (beta testing) Shorthand for: B<--sqlmaster> I B<--sqlworker> I. -=item B<--sqlworker> I (alpha testing) +=item B<--sqlworker> I (beta testing) Execute jobs via SQL server. Read the input sources variables from the table pointed to by I. The I on the command line @@ -2172,13 +2172,13 @@ different dir for the files. Setting B<--tmpdir> is equivalent to setting $TMPDIR. -=item B<--tmux> (alpha testing) +=item B<--tmux> (beta testing) Use B for output. Start a B session and run each job in a window in that session. No other output will be produced. -=item B<--tmuxpane> (alpha testing) +=item B<--tmuxpane> (beta testing) Use B for output but put output into panes in the first window. Useful if you want to monitor the progress of less than 100 concurrent @@ -2370,7 +2370,7 @@ To see the difference try: I can contain GNU B's replacement strings. -=item B<--wait> (beta testing) +=item B<--wait> Wait for all commands to complete. diff --git a/src/sql b/src/sql index b4bb0961..26e18534 100755 --- a/src/sql +++ b/src/sql @@ -576,7 +576,7 @@ $Global::Initfile && unlink $Global::Initfile; exit ($err); sub parse_options { - $Global::version = 20170122; + $Global::version = 20170123; $Global::progname = 'sql'; # This must be done first as this may exec myself diff --git a/testsuite/tests-to-run/parallel-local-10s.sh b/testsuite/tests-to-run/parallel-local-10s.sh index 71042ce8..e06a4120 100644 --- a/testsuite/tests-to-run/parallel-local-10s.sh +++ b/testsuite/tests-to-run/parallel-local-10s.sh @@ -234,6 +234,10 @@ par_kill_children_timeout() { pstree $$ | grep sleep | grep -v anacron | grep -v screensave | wc } +par_tmux_fg() { + echo 'bug #50107: --tmux --fg should also write how to access it' + stdout parallel --tmux --fg sleep ::: 3 | perl -pe 's/.tmp\S+/tmp/' +} export -f $(compgen -A function | grep par_) compgen -A function | grep par_ | sort | diff --git a/testsuite/wanted-results/parallel-local-10s b/testsuite/wanted-results/parallel-local-10s index d3561419..19cdafdc 100644 --- a/testsuite/wanted-results/parallel-local-10s +++ b/testsuite/wanted-results/parallel-local-10s @@ -1425,3 +1425,6 @@ par_testhalt sleep 1; exit 0 par_testhalt parallel: This job succeeded: par_testhalt sleep 1; exit 0 par_testhalt 50 +par_tmux_fg bug #50107: --tmux --fg should also write how to access it +par_tmux_fg See output with: tmux -S tmp attach +par_tmux_fg open terminal failed: not a terminal