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

parallel: When all jobs are done --bar shows total time elapsed.

Browse source
This commit is contained in:
Ole Tange 2023-11-03 22:46:35 +01:00
parent 6554437a72
commit 4c3396c31c
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/parallel
View file

@ -4296,6 +4296,7 @@ sub drain_job_queue(@) {
not $Global::start_no_new_jobs and not $Global::JobQueue->empty() not $Global::start_no_new_jobs and not $Global::JobQueue->empty()
or or
$opt::sqlmaster and not $Global::sql->finished()); $opt::sqlmaster and not $Global::sql->finished());
$Global::all_jobs_done = 1;
if($opt::progress) { if($opt::progress) {
my %progress = progress(); my %progress = progress();
::status("\r".$progress{'status'}); ::status("\r".$progress{'status'});
@ -4523,6 +4524,7 @@ sub progress() {
$reset ||= "\033[0m"; $reset ||= "\033[0m";
my($total, $completed, $left, $pctcomplete, $avgtime, $eta) = my($total, $completed, $left, $pctcomplete, $avgtime, $eta) =
compute_eta(); compute_eta();
if($Global::all_jobs_done) { $eta = now()-$Global::start_time; }
my $arg = $Global::newest_job ? my $arg = $Global::newest_job ?
$Global::newest_job->{'commandline'}-> $Global::newest_job->{'commandline'}->
replace_placeholders(["\257<\257>"],0,0) : ""; replace_placeholders(["\257<\257>"],0,0) : "";
@ -15203,6 +15205,7 @@ sub main() {
$opt::sqlworker = undef; $opt::sqlworker = undef;
} }
$Global::start_time = ::now();
if($opt::nonall or $opt::onall) { if($opt::nonall or $opt::onall) {
onall(\@input_source_fh,@command); onall(\@input_source_fh,@command);
wait_and_exit(min(undef_as_zero($Global::exitstatus),254)); wait_and_exit(min(undef_as_zero($Global::exitstatus),254));