tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-12-23 13:17:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

src/parallel: Implemented --results

Browse source
This commit is contained in:
Ole Tange 2012-09-28 15:25:33 +02:00
parent e2e9fcaf46
commit 418fa0e7e0
1 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/parallel
View file

@ -465,6 +465,7 @@ sub options_hash {
"X" => \$::opt_X, "X" => \$::opt_X,
"v" => \@::opt_v, "v" => \@::opt_v,
"joblog=s" => \$::opt_joblog, "joblog=s" => \$::opt_joblog,
"results=s" => \$::opt_results,
"resume" => \$::opt_resume, "resume" => \$::opt_resume,
"silent" => \$::opt_silent, "silent" => \$::opt_silent,
#"silent-error|silenterror" => \$::opt_silent_error, #"silent-error|silenterror" => \$::opt_silent_error,
@ -3198,6 +3199,21 @@ sub seq {
return $self->{'commandline'}->seq(); return $self->{'commandline'}->seq();
} }
sub openresultsfile {
my $self = shift;
my $args_as_filename = $self->{'commandline'}->args_as_filename();
my ($outfh,$errfh,$name);
$name = $::opt_results."stdout_".$args_as_filename;
open($outfh,"+>",$name) or ::error("Cannot write to `$name'.\n");
$self->set_stdoutfilename($name);
$name = $::opt_results."stderr_".$args_as_filename;
open($errfh,"+>",$name) or ::error("Cannot write to `$name'.\n");
open OUT, '>&', $outfh or ::die_bug("Can't redirect STDOUT: $!");
open ERR, '>&', $errfh or ::die_bug("Can't dup STDOUT: $!");
$self->set_stdout($outfh);
$self->set_stderr($errfh);
}
sub set_stdout { sub set_stdout {
my $self = shift; my $self = shift;
$self->{'stdout'} = shift; $self->{'stdout'} = shift;
@ -3725,7 +3741,9 @@ sub start {
local (*IN,*OUT,*ERR); local (*IN,*OUT,*ERR);
my $pid; my $pid;
if($Global::grouped) { if($::opt_results) {
$job->openresultsfile();
} elsif($Global::grouped) {
my ($outfh,$errfh,$name); my ($outfh,$errfh,$name);
# To group we create temporary files for STDOUT and STDERR # To group we create temporary files for STDOUT and STDERR
# To avoid the cleanup unlink the files immediately (but keep them open) # To avoid the cleanup unlink the files immediately (but keep them open)
@ -4184,6 +4202,19 @@ sub args_as_string {
map { @$_ } @{$self->{'arg_list'}}); map { @$_ } @{$self->{'arg_list'}});
} }
sub args_as_filename {
# Returns:
# all unmodified arguments joined with '\t' (similar to {})
# \t \0 \\ and / are quoted
my $self = shift;
return (join "\t",
map { s/\\/\\\\/g;
s/\t/\\\t/g;
s/\0/\\0/g;
s:/:\\_:g; $_ }
map { $_->orig() } map { @$_ } @{$self->{'arg_list'}});
}
sub len { sub len {
# The length of the command line with args substituted # The length of the command line with args substituted
my $self = shift; my $self = shift;