Commit 3a737169 by Edward Thomson

progress: fewer updates about throughput

Avoid too much flashing on the console with updates about throughput.
Only update throughput once a second.
parent 286e7f0a
......@@ -12,7 +12,13 @@
#include "progress.h"
#include "error.h"
#define PROGRESS_UPDATE_TIME 0.05
/*
* Show updates to the percentage and number of objects received
* separately from the throughput to give an accurate progress while
* avoiding too much noise on the screen.
*/
#define PROGRESS_UPDATE_TIME 0.10
#define THROUGHPUT_UPDATE_TIME 1.00
#define is_nl(c) ((c) == '\r' || (c) == '\n')
......@@ -200,11 +206,20 @@ static int fetch_receiving(
else
now = git__timer();
recv_len = (double)stats->received_bytes;
if (progress->throughput_update &&
now - progress->throughput_update < THROUGHPUT_UPDATE_TIME) {
elapsed = progress->throughput_update -
progress->action_start;
recv_len = progress->throughput_bytes;
} else {
elapsed = now - progress->action_start;
recv_len = (double)stats->received_bytes;
progress->throughput_update = now;
progress->throughput_bytes = recv_len;
}
elapsed = now - progress->action_start;
rate = elapsed ? recv_len / elapsed : 0;
done = (stats->received_objects == stats->total_objects);
while (recv_len > 1024 && recv_units[recv_unit_idx+1]) {
recv_len /= 1024;
......
......@@ -40,6 +40,10 @@ typedef struct {
git_str sideband;
git_str onscreen;
git_str deferred;
/* Last update about throughput */
double throughput_update;
double throughput_bytes;
} cli_progress;
#define CLI_PROGRESS_INIT { 0 }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment