--- a/progressmeter.c +++ b/progressmeter.c @@ -69,6 +69,8 @@ static off_t start_pos; /* initial position of transfer */ static off_t end_pos; /* ending position of transfer */ static off_t cur_pos; /* transfer position as of last refresh */ +static off_t last_pos; +static off_t max_delta_pos = 0; static volatile off_t *counter; /* progress counter */ static long stalled; /* how long we have been stalled */ static int bytes_per_second; /* current speed in bytes per second */ @@ -132,6 +132,7 @@ refresh_progress_meter(void) int cur_speed; int hours, minutes, seconds; int file_len; + off_t delta_pos; if ((!alarm_fired && !win_resized) || !can_output()) return; @@ -147,6 +148,10 @@ refresh_progress_meter(void) now = monotime_double(); bytes_left = end_pos - cur_pos; + delta_pos = cur_pos - last_pos; + if (delta_pos > max_delta_pos) + max_delta_pos = delta_pos; + if (bytes_left > 0) elapsed = now - last_update; else { @@ -171,7 +176,7 @@ refresh_progress_meter(void) /* filename */ buf[0] = '\0'; - file_len = win_size - 36; + file_len = win_size - 46; if (file_len > 0) { buf[0] = '\r'; snmprintf(buf+1, sizeof(buf)-1 , &file_len, "%*s", @@ -188,6 +195,15 @@ (off_t)bytes_per_second); strlcat(buf, "/s ", win_size); + /* instantaneous rate */ + if (bytes_left > 0) + format_rate(buf + strlen(buf), win_size - strlen(buf), + delta_pos); + else + format_rate(buf + strlen(buf), win_size - strlen(buf), + max_delta_pos); + strlcat(buf, "/s ", win_size); + /* ETA */ if (!transferred) stalled += elapsed; @@ -224,6 +240,7 @@ atomicio(vwrite, STDOUT_FILENO, buf, win_size - 1); last_update = now; + last_pos = cur_pos; } /*ARGSUSED*/