Ma/mscp
1
0
Fork 0
mirror of https://github.com/upa/mscp.git synced 2026-05-13 05:17:29 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

main: adopt rolling average of recent eight bps values to calculate ETA

Browse Source
This commit is contained in:
Ryo Nakamura
2023-09-13 16:14:40 +09:00
parent 05a7e96759
commit b298b2ec35
1 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main.c
View File

@@ -427,23 +427,43 @@ double calculate_bps(size_t diff, struct timeval *b, struct timeval *a)
return (double)diff / calculate_timedelta(b, a); return (double)diff / calculate_timedelta(b, a);
} }
char *calculate_eta(size_t remain, size_t diff, struct timeval *b, struct timeval *a, char *calculate_eta(size_t remain, size_t diff, struct timeval *b, struct timeval *a,
bool final) bool final)
{ {
static char buf[16]; static char buf[16];
double elapsed = calculate_timedelta(b, a);
double eta;
if (diff == 0) #define bps_window_size 16
static double bps_window[bps_window_size];
static size_t sum, idx, count;
double elapsed = calculate_timedelta(b, a);
double bps = diff / elapsed;
double avg, eta;
/* early return when diff == 0 (stalled) or final output */
if (diff == 0) {
snprintf(buf, sizeof(buf), "--:-- ETA"); snprintf(buf, sizeof(buf), "--:-- ETA");
else if (final) { return buf;
}
if (final) {
snprintf(buf, sizeof(buf), "%02d:%02d ", snprintf(buf, sizeof(buf), "%02d:%02d ",
(int)(floor(elapsed / 60)), (int)round(elapsed) % 60); (int)(floor(elapsed / 60)), (int)round(elapsed) % 60);
} else { return buf;
eta = remain / (diff / elapsed); }
snprintf(buf, sizeof(buf), "%02d:%02d ETA",
(int)floor(eta / 60), (int)round(eta) % 60); /* drop the old bps value and add the recent one */
} sum -= bps_window[idx];
bps_window[idx] = bps;
sum += bps_window[idx];
idx = (idx + 1) % bps_window_size;
count++;
/* calcuate ETA from avg of recent bps values */
avg = sum / min(count, bps_window_size);
eta = remain / avg;
snprintf(buf, sizeof(buf), "%02d:%02d ETA",
(int)floor(eta / 60), (int)round(eta) % 60);
return buf; return buf;
} }