emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb/progress.c: make sure we never get negative ETA

Browse Source 
function                                             old     new   delta
bb_progress_update                                   738     733      -5

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-02-11 12:59:11 +01:00
parent 838d4bb0cd
commit e52e67cb51
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libbb/progress.c
View File

@ -79,16 +79,20 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
int barlength; int barlength;
int kiloscale; int kiloscale;
beg_and_transferred = beg_size + transferred;
elapsed = monotonic_sec(); elapsed = monotonic_sec();
since_last_update = elapsed - p->lastupdate_sec; since_last_update = elapsed - p->lastupdate_sec;
/*
* Do not update on every call if (totalsize != 0 && transferred >= totalsize - beg_size) {
* (we can be called on every network read!) /* Last call. Do not skip this update */
*/ transferred = totalsize - beg_size; /* sanitize just in case */
if (since_last_update == 0 && beg_and_transferred < totalsize) }
else if (since_last_update == 0) {
/*
* Do not update on every call
* (we can be called on every network read!)
*/
return; return;
}
kiloscale = 0; kiloscale = 0;
/* /*
@ -101,32 +105,29 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
/* /*
* 64-bit CPU || small off_t: in either case, * 64-bit CPU || small off_t: in either case,
* >> is cheap, single-word operation. * >> is cheap, single-word operation.
* ... || strange off_t: also use this code (it is safe, * ... || strange off_t: also use this code
* even if suboptimal), because 32/64 optimized one * (it is safe, just suboptimal wrt code size),
* works only for 64-bit off_t. * because 32/64 optimized one works only for 64-bit off_t.
*/ */
if (totalsize >= (1 << 22)) { if (totalsize >= (1 << 22)) {
totalsize >>= 10; totalsize >>= 10;
beg_size >>= 10; beg_size >>= 10;
transferred >>= 10; transferred >>= 10;
beg_and_transferred >>= 10;
kiloscale = 1; kiloscale = 1;
} }
} else { } else {
/* 32-bit CPU and 64-bit off_t. /* 32-bit CPU and 64-bit off_t.
* Pick a shift (40 bits) which is easier to do on 32-bit CPU. * Use a 40-bit shift, it is easier to do on 32-bit CPU.
*/ */
if (totalsize >= (uoff_t)(1ULL << 54)) { if (totalsize >= (uoff_t)(1ULL << 54)) {
totalsize = (uint32_t)(totalsize >> 32) >> 8; totalsize = (uint32_t)(totalsize >> 32) >> 8;
beg_size = (uint32_t)(beg_size >> 32) >> 8; beg_size = (uint32_t)(beg_size >> 32) >> 8;
transferred = (uint32_t)(transferred >> 32) >> 8; transferred = (uint32_t)(transferred >> 32) >> 8;
beg_and_transferred = (uint32_t)(beg_and_transferred >> 32) >> 8;
kiloscale = 4; kiloscale = 4;
} }
} }
if (beg_and_transferred > totalsize) beg_and_transferred = beg_size + transferred;
beg_and_transferred = totalsize;
ratio = 100 * beg_and_transferred / totalsize; ratio = 100 * beg_and_transferred / totalsize;
#if ENABLE_UNICODE_SUPPORT #if ENABLE_UNICODE_SUPPORT
@ -163,7 +164,7 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
p->lastupdate_sec = elapsed; p->lastupdate_sec = elapsed;
p->lastsize = transferred; p->lastsize = transferred;
if (since_last_update >= STALLTIME) { if (since_last_update >= STALLTIME) {
/* We "cut off" these seconds from elapsed time /* We "cut out" these seconds from elapsed time
* by adjusting start time */ * by adjusting start time */
p->start_sec += since_last_update; p->start_sec += since_last_update;
} }