mirror of
https://git.savannah.gnu.org/git/parallel.git
synced 2024-11-22 05:57:54 +00:00
parallel: Evaluate --tagstring {=...=} for each line with --lb.
This commit is contained in:
parent
a24bef3d03
commit
e8d7b1627a
|
@ -228,6 +228,8 @@ New in this release:
|
||||||
|
|
||||||
https://techieroop.com/how-to-run-multiple-bash-scripts-in-parallel/
|
https://techieroop.com/how-to-run-multiple-bash-scripts-in-parallel/
|
||||||
|
|
||||||
|
https://blogs.oracle.com/solaris/announcing-oracle-solaris-114-sru10
|
||||||
|
|
||||||
* Bug fixes and man page updates.
|
* Bug fixes and man page updates.
|
||||||
|
|
||||||
Get the book: GNU Parallel 2018 http://www.lulu.com/shop/ole-tange/gnu-parallel-2018/paperback/product-23558902.html
|
Get the book: GNU Parallel 2018 http://www.lulu.com/shop/ole-tange/gnu-parallel-2018/paperback/product-23558902.html
|
||||||
|
|
41
src/parallel
41
src/parallel
|
@ -1593,14 +1593,21 @@ sub parse_options(@) {
|
||||||
if(defined $opt::silent) { $Global::verbose = 0; }
|
if(defined $opt::silent) { $Global::verbose = 0; }
|
||||||
if(defined $opt::null) { $/ = "\0"; }
|
if(defined $opt::null) { $/ = "\0"; }
|
||||||
if(defined $opt::d) { $/ = unquote_printf($opt::d) }
|
if(defined $opt::d) { $/ = unquote_printf($opt::d) }
|
||||||
|
parse_replacement_string_options();
|
||||||
if(defined $opt::tagstring) {
|
if(defined $opt::tagstring) {
|
||||||
$opt::tagstring = unquote_printf($opt::tagstring);
|
$opt::tagstring = unquote_printf($opt::tagstring);
|
||||||
|
if($opt::tagstring =~ /\Q$Global::parensleft\E.*\Q$Global::parensright\E/
|
||||||
|
and
|
||||||
|
$opt::linebuffer) {
|
||||||
|
# --tagstring contains {= =} and --linebuffer =>
|
||||||
|
# recompute replacement string for each use (do not cache)
|
||||||
|
$Global::cache_replacement_eval = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(defined $opt::interactive) { $Global::interactive = $opt::interactive; }
|
if(defined $opt::interactive) { $Global::interactive = $opt::interactive; }
|
||||||
if(defined $opt::quote) { $Global::quoting = 1; }
|
if(defined $opt::quote) { $Global::quoting = 1; }
|
||||||
if(defined $opt::r) { $Global::ignore_empty = 1; }
|
if(defined $opt::r) { $Global::ignore_empty = 1; }
|
||||||
if(defined $opt::verbose) { $Global::stderr_verbose = 1; }
|
if(defined $opt::verbose) { $Global::stderr_verbose = 1; }
|
||||||
parse_replacement_string_options();
|
|
||||||
if(defined $opt::eof) { $Global::end_of_file_string = $opt::eof; }
|
if(defined $opt::eof) { $Global::end_of_file_string = $opt::eof; }
|
||||||
if(defined $opt::max_args) {
|
if(defined $opt::max_args) {
|
||||||
$Global::max_number_of_args = $opt::max_args;
|
$Global::max_number_of_args = $opt::max_args;
|
||||||
|
@ -1993,6 +2000,7 @@ sub init_globals() {
|
||||||
# Quote replacement strings
|
# Quote replacement strings
|
||||||
$Global::quote_replace = 1;
|
$Global::quote_replace = 1;
|
||||||
$Global::total_completed = 0;
|
$Global::total_completed = 0;
|
||||||
|
$Global::cache_replacement_eval = 1;
|
||||||
# Read only table with default --rpl values
|
# Read only table with default --rpl values
|
||||||
%Global::replace =
|
%Global::replace =
|
||||||
(
|
(
|
||||||
|
@ -9537,8 +9545,8 @@ sub should_be_retried($) {
|
||||||
sub print($) {
|
sub print($) {
|
||||||
# Print the output of the jobs
|
# Print the output of the jobs
|
||||||
# Returns: N/A
|
# Returns: N/A
|
||||||
|
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
|
|
||||||
::debug("print", ">>joboutput ", $self->replaced(), "\n");
|
::debug("print", ">>joboutput ", $self->replaced(), "\n");
|
||||||
if($opt::dryrun) {
|
if($opt::dryrun) {
|
||||||
# Nothing was printed to this job:
|
# Nothing was printed to this job:
|
||||||
|
@ -9792,12 +9800,21 @@ sub print_linebuffer($) {
|
||||||
# One or more complete lines were found
|
# One or more complete lines were found
|
||||||
if($opt::tag or defined $opt::tagstring) {
|
if($opt::tag or defined $opt::tagstring) {
|
||||||
# Replace ^ with $tag within the full line
|
# Replace ^ with $tag within the full line
|
||||||
my $tag = $self->tag();
|
if($Global::cache_replacement_eval) {
|
||||||
# TODO --recend that can be partially in @$halfline_ref
|
# Replace with the same value for tag
|
||||||
substr($buf,0,$i-1) =~ s/(?<=[\n\r])/$tag/gm;
|
my $tag = $self->tag();
|
||||||
# The length changed, so find the new ending pos
|
unshift @$halfline_ref, $tag;
|
||||||
$i = (rindex($buf,"\n")+1) || (rindex($buf,"\r")+1);
|
# TODO --recend that can be partially in @$halfline_ref
|
||||||
unshift @$halfline_ref, $tag;
|
substr($buf,0,$i-1) =~ s/(?<=[\n\r])/$tag/gm;
|
||||||
|
# The length changed, so find the new ending pos
|
||||||
|
$i = (rindex($buf,"\n")+1) || (rindex($buf,"\r")+1);
|
||||||
|
} else {
|
||||||
|
# Replace with freshly computed value of tag
|
||||||
|
unshift @$halfline_ref, $self->tag();
|
||||||
|
substr($buf,0,$i-1) =~ s/(?<=[\n\r])/$self->tag()/gme;
|
||||||
|
# The length changed, so find the new ending pos
|
||||||
|
$i = (rindex($buf,"\n")+1) || (rindex($buf,"\r")+1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
# Print the partial line (halfline) and the last half
|
# Print the partial line (halfline) and the last half
|
||||||
print $out_fd @$halfline_ref, substr($buf,0,$i);
|
print $out_fd @$halfline_ref, substr($buf,0,$i);
|
||||||
|
@ -9939,7 +9956,7 @@ sub print_joblog($) {
|
||||||
|
|
||||||
sub tag($) {
|
sub tag($) {
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
if(not defined $self->{'tag'}) {
|
if(not defined $self->{'tag'} or not $Global::cache_replacement_eval) {
|
||||||
if($opt::tag or defined $opt::tagstring) {
|
if($opt::tag or defined $opt::tagstring) {
|
||||||
$self->{'tag'} = $self->{'commandline'}->
|
$self->{'tag'} = $self->{'commandline'}->
|
||||||
replace_placeholders([$opt::tagstring],0,0)."\t";
|
replace_placeholders([$opt::tagstring],0,0)."\t";
|
||||||
|
@ -11810,7 +11827,9 @@ sub total_jobs() {
|
||||||
# but it looks nice to be able to say {= $job->slot() =}
|
# but it looks nice to be able to say {= $job->slot() =}
|
||||||
$job = shift;
|
$job = shift;
|
||||||
$perlexpr =~ s/^(-?\d+)? *//; # Positional replace treated as normal replace
|
$perlexpr =~ s/^(-?\d+)? *//; # Positional replace treated as normal replace
|
||||||
if(not $self->{'cache'}{$perlexpr}) {
|
if(not $Global::cache_replacement_eval
|
||||||
|
or
|
||||||
|
not $self->{'cache'}{$perlexpr}) {
|
||||||
# Only compute the value once
|
# Only compute the value once
|
||||||
# Use $_ as the variable to change
|
# Use $_ as the variable to change
|
||||||
local $_;
|
local $_;
|
||||||
|
@ -12714,7 +12733,6 @@ sub main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
set_input_source_header(\@command,\@input_source_fh);
|
set_input_source_header(\@command,\@input_source_fh);
|
||||||
|
|
||||||
if($opt::filter_hosts and (@opt::sshlogin or @opt::sshloginfile)) {
|
if($opt::filter_hosts and (@opt::sshlogin or @opt::sshloginfile)) {
|
||||||
# Parallel check all hosts are up. Remove hosts that are down
|
# Parallel check all hosts are up. Remove hosts that are down
|
||||||
filter_hosts();
|
filter_hosts();
|
||||||
|
@ -12749,7 +12767,6 @@ sub main() {
|
||||||
# Compute $Global::max_jobs_running
|
# Compute $Global::max_jobs_running
|
||||||
# Must be done after ungetting any --pipepart jobs.
|
# Must be done after ungetting any --pipepart jobs.
|
||||||
max_jobs_running();
|
max_jobs_running();
|
||||||
|
|
||||||
init_run_jobs();
|
init_run_jobs();
|
||||||
my $sem;
|
my $sem;
|
||||||
if($Global::semaphore) {
|
if($Global::semaphore) {
|
||||||
|
|
Loading…
Reference in a new issue