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

src/parallel: Small --bar bugs.

Browse source
This commit is contained in:
Ole Tange 2013-11-01 17:21:36 +01:00
parent f1a40b3aff
commit 59fd5ed103
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/parallel
View file

@ -323,7 +323,7 @@ if($opt::pipe and @opt::a) {
#print ::my_dump($cmd); #print ::my_dump($cmd);
} }
if($opt::eta or $opt::etas) { if($opt::eta or $opt::bar) {
# Count the number of jobs before starting any # Count the number of jobs before starting any
$Global::JobQueue->total_jobs(); $Global::JobQueue->total_jobs();
} }
@ -1685,12 +1685,14 @@ sub drain_job_queue {
$last_header = $progress{'header'}; $last_header = $progress{'header'};
} }
print $Global::original_stderr "\r",$progress{'status'}; print $Global::original_stderr "\r",$progress{'status'};
flush $Global::original_stderr;
} }
if($Global::total_running < $Global::max_jobs_running if($Global::total_running < $Global::max_jobs_running
and not $Global::JobQueue->empty()) { and not $Global::JobQueue->empty()) {
# These jobs may not be started because of loadavg # These jobs may not be started because of loadavg
# or too little time between each ssh login. # or too little time between each ssh login.
if(start_more_jobs() > 0) { if(start_more_jobs() > 0) {
# Exponential back-on if jobs were started
$sleep = $sleep/2+0.001; $sleep = $sleep/2+0.001;
} }
} }
@ -1709,6 +1711,7 @@ sub drain_job_queue {
if($opt::progress) { if($opt::progress) {
my %progress = progress(); my %progress = progress();
print $Global::original_stderr "\r", $progress{'status'}, "\n"; print $Global::original_stderr "\r", $progress{'status'}, "\n";
flush $Global::original_stderr;
} }
} }