aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
Diffstat (limited to 'libbb')
-rw-r--r--libbb/progress.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/libbb/progress.c b/libbb/progress.c
index f1d980d68..23e974ce7 100644
--- a/libbb/progress.c
+++ b/libbb/progress.c
@@ -57,6 +57,9 @@ void FAST_FUNC bb_progress_init(bb_progress_t *p, const char *curfile)
57 p->last_update_sec = p->start_sec; 57 p->last_update_sec = p->start_sec;
58 p->last_change_sec = p->start_sec; 58 p->last_change_sec = p->start_sec;
59 p->last_size = 0; 59 p->last_size = 0;
60#if 0
61 p->last_eta = INT_MAX;
62#endif
60} 63}
61 64
62/* File already had beg_size bytes. 65/* File already had beg_size bytes.
@@ -192,6 +195,16 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
192 /* if 32bit, can overflow ^^^^^^^^^^, but this would only show bad ETA */ 195 /* if 32bit, can overflow ^^^^^^^^^^, but this would only show bad ETA */
193 if (eta >= 1000*60*60) 196 if (eta >= 1000*60*60)
194 eta = 1000*60*60 - 1; 197 eta = 1000*60*60 - 1;
198#if 0
199 /* To prevent annoying "back-and-forth" estimation jitter,
200 * if new ETA is larger than the last just by a few seconds,
201 * disregard it, and show last one. The end result is that
202 * ETA usually only decreases, unless download slows down a lot.
203 */
204 if ((unsigned)(eta - p->last_eta) < 10)
205 eta = p->last_eta;
206 p->last_eta = eta;
207#endif
195 secs = eta % 3600; 208 secs = eta % 3600;
196 hours = eta / 3600; 209 hours = eta / 3600;
197 fprintf(stderr, "%3u:%02u:%02u ETA", hours, secs / 60, secs % 60); 210 fprintf(stderr, "%3u:%02u:%02u ETA", hours, secs / 60, secs % 60);