tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-25 23:47:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parallel: implemented basic --joblog Bug#31858

Browse source
This commit is contained in:
Ole Tange 2011-01-05 14:46:45 +01:00
parent 84fa4b35e0
commit e51bc579c8
1 changed files with 52 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/parallel
View file

@ -117,6 +117,7 @@ sub get_options_from_array {
"xargs|m" => \$::opt_m, "xargs|m" => \$::opt_m,
"X" => \$::opt_X, "X" => \$::opt_X,
"v" => \@::opt_v, "v" => \@::opt_v,
"joblog=s" => \$::opt_joblog,
"silent" => \$::opt_silent, "silent" => \$::opt_silent,
"keep-order|keeporder|k" => \$::opt_k, "keep-order|keeporder|k" => \$::opt_k,
"group|g" => \$::opt_g, "group|g" => \$::opt_g,
@ -340,6 +341,12 @@ sub parse_options {
# $sshlogin->set_max_jobs_running($Global::default_simultaneous_sshlogins); # $sshlogin->set_max_jobs_running($Global::default_simultaneous_sshlogins);
#} #}
} }
if($::opt_joblog) {
if(not open($Global::joblog,">$::opt_joblog")) {
print STDERR "Cannot write to --joblog $::opt_joblog\n";
::wait_and_exit(255);
}
}
} }
sub read_options { sub read_options {
@ -1173,6 +1180,7 @@ sub reaper {
$job or next; $job or next;
$job->set_exitstatus($? >> 8); $job->set_exitstatus($? >> 8);
debug("died (".$job->exitstatus()."): ".$job->seq()); debug("died (".$job->exitstatus()."): ".$job->seq());
$job->set_endtime();
if($stiff == $Global::tty_taken) { if($stiff == $Global::tty_taken) {
# The process that died had the tty => release it # The process that died had the tty => release it
$Global::tty_taken = 0; $Global::tty_taken = 0;
@ -2192,6 +2200,34 @@ sub set_pid {
$self->{'pid'} = $pid; $self->{'pid'} = $pid;
} }
sub starttime {
my $self = shift;
return $self->{'starttime'};
}
sub set_starttime {
my $self = shift;
my $starttime = shift || time;
$self->{'starttime'} = $starttime;
}
sub runtime {
my $self = shift;
return $self->{'endtime'}-$self->{'starttime'};
}
sub endtime {
my $self = shift;
return $self->{'endtime'};
}
sub set_endtime {
my $self = shift;
my $endtime = shift || time;
$self->{'endtime'} = $endtime;
}
sub failed { sub failed {
# return number of times failed for this $sshlogin # return number of times failed for this $sshlogin
my $self = shift; my $self = shift;
@ -2548,6 +2584,7 @@ sub start {
die("open3 (with gensym) failed. Report a bug to <bug-parallel\@gnu.org>\n"); die("open3 (with gensym) failed. Report a bug to <bug-parallel\@gnu.org>\n");
} }
$job->set_pid($pid); $job->set_pid($pid);
$job->set_starttime();
open STDOUT, ">&", $Global::original_stdout open STDOUT, ">&", $Global::original_stdout
or die "Can't dup \$Global::original_stdout: $!"; or die "Can't dup \$Global::original_stdout: $!";
open STDERR, ">&", $Global::original_stderr open STDERR, ">&", $Global::original_stderr
@ -2595,6 +2632,21 @@ sub print {
my $err = $self->stderr(); my $err = $self->stderr();
my $command = $self->sshlogin_wrap(); my $command = $self->sshlogin_wrap();
if($Global::joblog) {
my $cmd;
if($Global::verbose <= 1) {
$cmd = $self->replaced();
} else {
# Verbose level > 1: Print the rsync and stuff
$cmd = $command;
}
printf $Global::joblog
join("\t", $self->seq(), $self->sshlogin()->string(),
$self->starttime(), $self->runtime(), $cmd
). "\n";
flush $Global::joblog;
}
if(($::opt_dryrun or $Global::verbose) and $Global::grouped) { if(($::opt_dryrun or $Global::verbose) and $Global::grouped) {
if($Global::verbose <= 1) { if($Global::verbose <= 1) {
print STDOUT $self->replaced(),"\n"; print STDOUT $self->replaced(),"\n";