tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-22 14:07:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parallel: --joblog format.

Browse source
This commit is contained in:
Ole Tange 2014-02-08 22:16:56 +01:00
parent 2c07fa5c17
commit 4ef63ba2e1
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/parallel
View file

@ -965,7 +965,7 @@ sub open_joblog {
if(/$joblog_regexp/o) { if(/$joblog_regexp/o) {
# This is 30% faster than set_job_already_run($1); # This is 30% faster than set_job_already_run($1);
vec($Global::job_already_run,($1||0),1) = 1; vec($Global::job_already_run,($1||0),1) = 1;
} elsif(not /\d+\t[^\t]+\t([0-9.]+\t){6}/) { } elsif(not /\d+\s+[^\s]+\s+([0-9.]+\s+){6}/) {
::error("Format of '$opt::joblog' is wrong: $_"); ::error("Format of '$opt::joblog' is wrong: $_");
::wait_and_exit(255); ::wait_and_exit(255);
} }
@ -4084,6 +4084,8 @@ sub openoutputfiles {
$self->set_fd_file_name(1,$outname); $self->set_fd_file_name(1,$outname);
$self->set_fd_file_name(2,$errname); $self->set_fd_file_name(2,$errname);
if($opt::compress) { if($opt::compress) {
# Send stdout to stdin for $opt::compress_program(1)
# Send stderr to stdin for $opt::compress_program(2)
$self->set_fd_input(1, $outfh); $self->set_fd_input(1, $outfh);
$self->set_fd_input(2, $errfh); $self->set_fd_input(2, $errfh);
my $rm = $unlink_out ? "rm" : "true"; my $rm = $unlink_out ? "rm" : "true";
@ -5336,7 +5338,6 @@ sub args_as_dirname {
for my $rec_ref (@{$self->{'arg_list'}}) { for my $rec_ref (@{$self->{'arg_list'}}) {
my @header_indexes_sorted = header_indexes_sorted($#$rec_ref+1); my @header_indexes_sorted = header_indexes_sorted($#$rec_ref+1);
for my $n (@header_indexes_sorted) { for my $n (@header_indexes_sorted) {
CORE::push(@res, CORE::push(@res,
$Global::input_source_header{$n}, $Global::input_source_header{$n},