2007-10-30 19:41:13 +00:00
|
|
|
/*
|
|
|
|
* Simple text-based progress display module for GIT
|
|
|
|
*
|
2009-09-14 06:41:16 +00:00
|
|
|
* Copyright (c) 2007 by Nicolas Pitre <nico@fluxnic.net>
|
2007-10-30 19:41:13 +00:00
|
|
|
*
|
|
|
|
* This code is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
*/
|
|
|
|
|
2007-04-18 18:27:45 +00:00
|
|
|
#include "git-compat-util.h"
|
|
|
|
#include "progress.h"
|
|
|
|
|
2007-10-30 18:57:34 +00:00
|
|
|
#define TP_IDX_MAX 8
|
|
|
|
|
|
|
|
struct throughput {
|
2007-11-06 21:30:28 +00:00
|
|
|
off_t curr_total;
|
2007-11-05 03:15:41 +00:00
|
|
|
off_t prev_total;
|
2007-10-30 18:57:34 +00:00
|
|
|
struct timeval prev_tv;
|
2007-11-05 03:15:41 +00:00
|
|
|
unsigned int avg_bytes;
|
2007-10-30 18:57:34 +00:00
|
|
|
unsigned int avg_misecs;
|
2007-11-06 21:30:28 +00:00
|
|
|
unsigned int last_bytes[TP_IDX_MAX];
|
2007-10-30 18:57:34 +00:00
|
|
|
unsigned int last_misecs[TP_IDX_MAX];
|
|
|
|
unsigned int idx;
|
2007-11-01 20:59:57 +00:00
|
|
|
char display[32];
|
2007-10-30 18:57:34 +00:00
|
|
|
};
|
|
|
|
|
2007-10-30 18:57:32 +00:00
|
|
|
struct progress {
|
|
|
|
const char *title;
|
|
|
|
int last_value;
|
|
|
|
unsigned total;
|
|
|
|
unsigned last_percent;
|
|
|
|
unsigned delay;
|
|
|
|
unsigned delayed_percent_treshold;
|
2007-10-30 18:57:34 +00:00
|
|
|
struct throughput *throughput;
|
2007-10-30 18:57:32 +00:00
|
|
|
};
|
|
|
|
|
2007-04-18 18:27:45 +00:00
|
|
|
static volatile sig_atomic_t progress_update;
|
|
|
|
|
|
|
|
static void progress_interval(int signum)
|
|
|
|
{
|
|
|
|
progress_update = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void set_progress_signal(void)
|
|
|
|
{
|
|
|
|
struct sigaction sa;
|
|
|
|
struct itimerval v;
|
|
|
|
|
2007-04-20 19:05:27 +00:00
|
|
|
progress_update = 0;
|
|
|
|
|
2007-04-18 18:27:45 +00:00
|
|
|
memset(&sa, 0, sizeof(sa));
|
|
|
|
sa.sa_handler = progress_interval;
|
|
|
|
sigemptyset(&sa.sa_mask);
|
|
|
|
sa.sa_flags = SA_RESTART;
|
|
|
|
sigaction(SIGALRM, &sa, NULL);
|
|
|
|
|
|
|
|
v.it_interval.tv_sec = 1;
|
|
|
|
v.it_interval.tv_usec = 0;
|
|
|
|
v.it_value = v.it_interval;
|
|
|
|
setitimer(ITIMER_REAL, &v, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void clear_progress_signal(void)
|
|
|
|
{
|
|
|
|
struct itimerval v = {{0,},};
|
|
|
|
setitimer(ITIMER_REAL, &v, NULL);
|
|
|
|
signal(SIGALRM, SIG_IGN);
|
|
|
|
progress_update = 0;
|
|
|
|
}
|
|
|
|
|
2007-11-08 20:45:41 +00:00
|
|
|
static int display(struct progress *progress, unsigned n, const char *done)
|
2007-04-18 18:27:45 +00:00
|
|
|
{
|
2007-11-08 20:45:41 +00:00
|
|
|
const char *eol, *tp;
|
2007-10-17 01:55:45 +00:00
|
|
|
|
2007-04-20 19:05:27 +00:00
|
|
|
if (progress->delay) {
|
|
|
|
if (!progress_update || --progress->delay)
|
|
|
|
return 0;
|
|
|
|
if (progress->total) {
|
|
|
|
unsigned percent = n * 100 / progress->total;
|
|
|
|
if (percent > progress->delayed_percent_treshold) {
|
|
|
|
/* inhibit this progress report entirely */
|
|
|
|
clear_progress_signal();
|
|
|
|
progress->delay = -1;
|
|
|
|
progress->total = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2007-10-17 01:55:45 +00:00
|
|
|
|
|
|
|
progress->last_value = n;
|
2007-10-30 18:57:34 +00:00
|
|
|
tp = (progress->throughput) ? progress->throughput->display : "";
|
2007-11-08 20:45:41 +00:00
|
|
|
eol = done ? done : " \r";
|
2007-04-18 18:27:45 +00:00
|
|
|
if (progress->total) {
|
|
|
|
unsigned percent = n * 100 / progress->total;
|
|
|
|
if (percent != progress->last_percent || progress_update) {
|
|
|
|
progress->last_percent = percent;
|
2007-10-30 18:57:34 +00:00
|
|
|
fprintf(stderr, "%s: %3u%% (%u/%u)%s%s",
|
|
|
|
progress->title, percent, n,
|
|
|
|
progress->total, tp, eol);
|
2007-11-19 19:48:58 +00:00
|
|
|
fflush(stderr);
|
2007-04-18 18:27:45 +00:00
|
|
|
progress_update = 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
} else if (progress_update) {
|
2007-10-30 18:57:34 +00:00
|
|
|
fprintf(stderr, "%s: %u%s%s", progress->title, n, tp, eol);
|
2007-11-19 19:48:58 +00:00
|
|
|
fflush(stderr);
|
2007-04-18 18:27:45 +00:00
|
|
|
progress_update = 0;
|
|
|
|
return 1;
|
|
|
|
}
|
2007-10-17 01:55:45 +00:00
|
|
|
|
2007-04-18 18:27:45 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-11-06 21:30:28 +00:00
|
|
|
static void throughput_string(struct throughput *tp, off_t total,
|
|
|
|
unsigned int rate)
|
|
|
|
{
|
|
|
|
int l = sizeof(tp->display);
|
|
|
|
if (total > 1 << 30) {
|
|
|
|
l -= snprintf(tp->display, l, ", %u.%2.2u GiB",
|
|
|
|
(int)(total >> 30),
|
|
|
|
(int)(total & ((1 << 30) - 1)) / 10737419);
|
|
|
|
} else if (total > 1 << 20) {
|
2009-04-24 21:46:15 +00:00
|
|
|
int x = total + 5243; /* for rounding */
|
2007-11-06 21:30:28 +00:00
|
|
|
l -= snprintf(tp->display, l, ", %u.%2.2u MiB",
|
2009-04-24 21:46:15 +00:00
|
|
|
x >> 20, ((x & ((1 << 20) - 1)) * 100) >> 20);
|
2007-11-06 21:30:28 +00:00
|
|
|
} else if (total > 1 << 10) {
|
2009-04-24 21:46:15 +00:00
|
|
|
int x = total + 5; /* for rounding */
|
2007-11-06 21:30:28 +00:00
|
|
|
l -= snprintf(tp->display, l, ", %u.%2.2u KiB",
|
2009-04-24 21:46:15 +00:00
|
|
|
x >> 10, ((x & ((1 << 10) - 1)) * 100) >> 10);
|
2007-11-06 21:30:28 +00:00
|
|
|
} else {
|
|
|
|
l -= snprintf(tp->display, l, ", %u bytes", (int)total);
|
|
|
|
}
|
2009-10-14 03:02:04 +00:00
|
|
|
|
|
|
|
if (rate > 1 << 10) {
|
|
|
|
int x = rate + 5; /* for rounding */
|
|
|
|
snprintf(tp->display + sizeof(tp->display) - l, l,
|
|
|
|
" | %u.%2.2u MiB/s",
|
|
|
|
x >> 10, ((x & ((1 << 10) - 1)) * 100) >> 10);
|
|
|
|
} else if (rate)
|
2007-11-06 21:30:28 +00:00
|
|
|
snprintf(tp->display + sizeof(tp->display) - l, l,
|
|
|
|
" | %u KiB/s", rate);
|
|
|
|
}
|
|
|
|
|
2007-11-05 03:15:41 +00:00
|
|
|
void display_throughput(struct progress *progress, off_t total)
|
2007-10-30 18:57:34 +00:00
|
|
|
{
|
|
|
|
struct throughput *tp;
|
|
|
|
struct timeval tv;
|
|
|
|
unsigned int misecs;
|
|
|
|
|
|
|
|
if (!progress)
|
|
|
|
return;
|
|
|
|
tp = progress->throughput;
|
|
|
|
|
|
|
|
gettimeofday(&tv, NULL);
|
|
|
|
|
|
|
|
if (!tp) {
|
|
|
|
progress->throughput = tp = calloc(1, sizeof(*tp));
|
2007-11-05 03:15:41 +00:00
|
|
|
if (tp) {
|
2007-11-06 21:30:28 +00:00
|
|
|
tp->prev_total = tp->curr_total = total;
|
2007-10-30 18:57:34 +00:00
|
|
|
tp->prev_tv = tv;
|
2007-11-05 03:15:41 +00:00
|
|
|
}
|
2007-10-30 18:57:34 +00:00
|
|
|
return;
|
|
|
|
}
|
2007-11-06 21:30:28 +00:00
|
|
|
tp->curr_total = total;
|
2007-10-30 18:57:34 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* We have x = bytes and y = microsecs. We want z = KiB/s:
|
|
|
|
*
|
|
|
|
* z = (x / 1024) / (y / 1000000)
|
|
|
|
* z = x / y * 1000000 / 1024
|
|
|
|
* z = x / (y * 1024 / 1000000)
|
|
|
|
* z = x / y'
|
|
|
|
*
|
|
|
|
* To simplify things we'll keep track of misecs, or 1024th of a sec
|
|
|
|
* obtained with:
|
|
|
|
*
|
|
|
|
* y' = y * 1024 / 1000000
|
|
|
|
* y' = y / (1000000 / 1024)
|
|
|
|
* y' = y / 977
|
|
|
|
*/
|
|
|
|
misecs = (tv.tv_sec - tp->prev_tv.tv_sec) * 1024;
|
|
|
|
misecs += (int)(tv.tv_usec - tp->prev_tv.tv_usec) / 977;
|
|
|
|
|
|
|
|
if (misecs > 512) {
|
2007-11-06 21:30:28 +00:00
|
|
|
unsigned int count, rate;
|
|
|
|
|
|
|
|
count = total - tp->prev_total;
|
2007-11-05 03:15:41 +00:00
|
|
|
tp->prev_total = total;
|
2007-10-30 18:57:34 +00:00
|
|
|
tp->prev_tv = tv;
|
2007-11-05 03:15:41 +00:00
|
|
|
tp->avg_bytes += count;
|
2007-10-30 18:57:34 +00:00
|
|
|
tp->avg_misecs += misecs;
|
2007-11-06 21:30:28 +00:00
|
|
|
rate = tp->avg_bytes / tp->avg_misecs;
|
2007-10-30 18:57:34 +00:00
|
|
|
tp->avg_bytes -= tp->last_bytes[tp->idx];
|
|
|
|
tp->avg_misecs -= tp->last_misecs[tp->idx];
|
2007-11-05 03:15:41 +00:00
|
|
|
tp->last_bytes[tp->idx] = count;
|
2007-10-30 18:57:34 +00:00
|
|
|
tp->last_misecs[tp->idx] = misecs;
|
|
|
|
tp->idx = (tp->idx + 1) % TP_IDX_MAX;
|
2007-11-01 20:59:56 +00:00
|
|
|
|
2007-11-06 21:30:28 +00:00
|
|
|
throughput_string(tp, total, rate);
|
2007-11-01 20:59:56 +00:00
|
|
|
if (progress->last_value != -1 && progress_update)
|
2007-11-08 20:45:41 +00:00
|
|
|
display(progress, progress->last_value, NULL);
|
2007-10-30 18:57:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-10-17 01:55:45 +00:00
|
|
|
int display_progress(struct progress *progress, unsigned n)
|
2007-04-18 18:27:45 +00:00
|
|
|
{
|
2007-11-08 20:45:41 +00:00
|
|
|
return progress ? display(progress, n, NULL) : 0;
|
2007-04-18 18:27:45 +00:00
|
|
|
}
|
|
|
|
|
2007-10-30 18:57:32 +00:00
|
|
|
struct progress *start_progress_delay(const char *title, unsigned total,
|
|
|
|
unsigned percent_treshold, unsigned delay)
|
2007-04-20 19:05:27 +00:00
|
|
|
{
|
2007-10-30 18:57:32 +00:00
|
|
|
struct progress *progress = malloc(sizeof(*progress));
|
|
|
|
if (!progress) {
|
|
|
|
/* unlikely, but here's a good fallback */
|
|
|
|
fprintf(stderr, "%s...\n", title);
|
2007-11-19 19:48:58 +00:00
|
|
|
fflush(stderr);
|
2007-10-30 18:57:32 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2007-10-17 01:55:45 +00:00
|
|
|
progress->title = title;
|
2007-04-20 19:05:27 +00:00
|
|
|
progress->total = total;
|
2007-10-17 01:55:45 +00:00
|
|
|
progress->last_value = -1;
|
2007-04-20 19:05:27 +00:00
|
|
|
progress->last_percent = -1;
|
|
|
|
progress->delayed_percent_treshold = percent_treshold;
|
|
|
|
progress->delay = delay;
|
2007-10-30 18:57:34 +00:00
|
|
|
progress->throughput = NULL;
|
2007-04-20 19:05:27 +00:00
|
|
|
set_progress_signal();
|
2007-10-30 18:57:32 +00:00
|
|
|
return progress;
|
2007-04-20 19:05:27 +00:00
|
|
|
}
|
|
|
|
|
2007-10-30 18:57:32 +00:00
|
|
|
struct progress *start_progress(const char *title, unsigned total)
|
2007-10-17 01:55:45 +00:00
|
|
|
{
|
2007-10-30 18:57:32 +00:00
|
|
|
return start_progress_delay(title, total, 0, 0);
|
2007-10-17 01:55:45 +00:00
|
|
|
}
|
|
|
|
|
2007-10-30 18:57:32 +00:00
|
|
|
void stop_progress(struct progress **p_progress)
|
2007-11-08 20:45:41 +00:00
|
|
|
{
|
|
|
|
stop_progress_msg(p_progress, "done");
|
|
|
|
}
|
|
|
|
|
|
|
|
void stop_progress_msg(struct progress **p_progress, const char *msg)
|
2007-04-18 18:27:45 +00:00
|
|
|
{
|
2007-10-30 18:57:32 +00:00
|
|
|
struct progress *progress = *p_progress;
|
|
|
|
if (!progress)
|
|
|
|
return;
|
|
|
|
*p_progress = NULL;
|
2007-10-17 01:55:45 +00:00
|
|
|
if (progress->last_value != -1) {
|
|
|
|
/* Force the last update */
|
2008-06-08 15:26:15 +00:00
|
|
|
char buf[128], *bufp;
|
|
|
|
size_t len = strlen(msg) + 5;
|
2007-11-06 21:30:28 +00:00
|
|
|
struct throughput *tp = progress->throughput;
|
2008-06-08 15:26:15 +00:00
|
|
|
|
|
|
|
bufp = (len < sizeof(buf)) ? buf : xmalloc(len + 1);
|
2007-11-06 21:30:28 +00:00
|
|
|
if (tp) {
|
|
|
|
unsigned int rate = !tp->avg_misecs ? 0 :
|
|
|
|
tp->avg_bytes / tp->avg_misecs;
|
|
|
|
throughput_string(tp, tp->curr_total, rate);
|
|
|
|
}
|
2007-10-17 01:55:45 +00:00
|
|
|
progress_update = 1;
|
2008-06-08 15:26:15 +00:00
|
|
|
sprintf(bufp, ", %s.\n", msg);
|
|
|
|
display(progress, progress->last_value, bufp);
|
|
|
|
if (buf != bufp)
|
|
|
|
free(bufp);
|
2007-10-17 01:55:45 +00:00
|
|
|
}
|
2007-04-18 18:27:45 +00:00
|
|
|
clear_progress_signal();
|
2007-10-30 18:57:34 +00:00
|
|
|
free(progress->throughput);
|
2007-10-30 18:57:32 +00:00
|
|
|
free(progress);
|
2007-04-18 18:27:45 +00:00
|
|
|
}
|