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

parallel: Implemented --resume-failed.

Browse source
This commit is contained in:
Ole Tange 2013-02-10 23:22:53 +01:00
parent 55ad133f46
commit 42751ae6a9
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/parallel
View file

@ -489,6 +489,7 @@ sub options_hash {
"joblog=s" => \$opt::joblog, "joblog=s" => \$opt::joblog,
"results|result|res=s" => \$opt::results, "results|result|res=s" => \$opt::results,
"resume" => \$opt::resume, "resume" => \$opt::resume,
"resume-failed|resumefailed" => \$opt::resume_failed,
"silent" => \$opt::silent, "silent" => \$opt::silent,
#"silent-error|silenterror" => \$opt::silent_error, #"silent-error|silenterror" => \$opt::silent_error,
"keep-order|keeporder|k" => \$opt::k, "keep-order|keeporder|k" => \$opt::k,
@ -901,21 +902,30 @@ sub parse_env_var {
sub open_joblog { sub open_joblog {
my $append = 0; my $append = 0;
if($opt::resume and not $opt::joblog) { if(($opt::resume or $opt::resume_failed) and not $opt::joblog) {
::error("--resume requires --joblog.\n"); ::error("--resume and --resume-failed require --joblog.\n");
::wait_and_exit(255); ::wait_and_exit(255);
} }
if($opt::joblog) { if($opt::joblog) {
if($opt::resume) { if($opt::resume || $opt::resume_failed) {
if(open(my $joblog_fh, "<", $opt::joblog)) { if(open(my $joblog_fh, "<", $opt::joblog)) {
# Read the joblog # Read the joblog
$append = <$joblog_fh>; # If there is a header: Open as append later $append = <$joblog_fh>; # If there is a header: Open as append later
while(<$joblog_fh>) { my $joblog_regexp;
if(/^(\d+)/) { if($opt::resume_failed) {
# This is 30% faster than set_job_already_run($1); # Make a regexp that only matches commands with exit+signal=0
vec($Global::job_already_run,$1,1) = 1; # 4 host 1360490623.067 3.445 1023 1222 0 0 command
$joblog_regexp='^(\d+)(?:\t[^\t]+){5}\t0\t0\t';
} else { } else {
::error("Format of '$opt::joblog' is wrong.\n"); # Just match the job number
$joblog_regexp='^(\d+)';
}
while(<$joblog_fh>) {
if(/$joblog_regexp/o) {
# This is 30% faster than set_job_already_run($1);
vec($Global::job_already_run,$1||0,1) = 1;
} elsif(not /\d+\t[^\t]+\t([0-9.]+\t){6}/) {
::error("Format of '$opt::joblog' is wrong: $_");
::wait_and_exit(255); ::wait_and_exit(255);
} }
} }
@ -4908,7 +4918,7 @@ sub binary_find_max_length {
my ($lower, $upper) = (@_); my ($lower, $upper) = (@_);
if($lower == $upper or $lower == $upper-1) { return $lower; } if($lower == $upper or $lower == $upper-1) { return $lower; }
my $middle = int (($upper-$lower)/2 + $lower); my $middle = int (($upper-$lower)/2 + $lower);
::debug("Maxlen: $lower,$upper,$middle\n"); ::debug("Maxlen: $lower,$upper,$middle : ");
if (is_acceptable_command_line_length($middle)) { if (is_acceptable_command_line_length($middle)) {
return binary_find_max_length($middle,$upper); return binary_find_max_length($middle,$upper);
} else { } else {
@ -4927,7 +4937,7 @@ sub is_acceptable_command_line_length {
open (STDERR, ">", "/dev/null"); open (STDERR, ">", "/dev/null");
system "true "."x"x$len; system "true "."x"x$len;
close STDERR; close STDERR;
::debug("$len $?\n"); ::debug("$len=$? ");
return not $?; return not $?;
} }