2007-04-18 20:27:45 +02:00
|
|
|
#include "git-compat-util.h"
|
|
|
|
#include "progress.h"
|
|
|
|
|
2007-10-30 19:57:32 +01:00
|
|
|
struct progress {
|
|
|
|
const char *title;
|
|
|
|
int last_value;
|
|
|
|
unsigned total;
|
|
|
|
unsigned last_percent;
|
|
|
|
unsigned delay;
|
|
|
|
unsigned delayed_percent_treshold;
|
|
|
|
};
|
|
|
|
|
2007-04-18 20:27:45 +02: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 21:05:27 +02:00
|
|
|
progress_update = 0;
|
|
|
|
|
2007-04-18 20:27:45 +02: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-10-17 03:55:45 +02:00
|
|
|
static int display(struct progress *progress, unsigned n, int done)
|
2007-04-18 20:27:45 +02:00
|
|
|
{
|
2007-10-17 03:55:45 +02:00
|
|
|
char *eol;
|
|
|
|
|
2007-04-20 21:05:27 +02: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 03:55:45 +02:00
|
|
|
|
|
|
|
progress->last_value = n;
|
|
|
|
eol = done ? ", done. \n" : " \r";
|
2007-04-18 20:27:45 +02:00
|
|
|
if (progress->total) {
|
|
|
|
unsigned percent = n * 100 / progress->total;
|
|
|
|
if (percent != progress->last_percent || progress_update) {
|
|
|
|
progress->last_percent = percent;
|
2007-10-17 03:55:45 +02:00
|
|
|
fprintf(stderr, "%s: %3u%% (%u/%u)%s", progress->title,
|
|
|
|
percent, n, progress->total, eol);
|
2007-04-18 20:27:45 +02:00
|
|
|
progress_update = 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
} else if (progress_update) {
|
2007-10-17 03:55:45 +02:00
|
|
|
fprintf(stderr, "%s: %u%s", progress->title, n, eol);
|
2007-04-18 20:27:45 +02:00
|
|
|
progress_update = 0;
|
|
|
|
return 1;
|
|
|
|
}
|
2007-10-17 03:55:45 +02:00
|
|
|
|
2007-04-18 20:27:45 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-10-17 03:55:45 +02:00
|
|
|
int display_progress(struct progress *progress, unsigned n)
|
2007-04-18 20:27:45 +02:00
|
|
|
{
|
2007-10-30 19:57:32 +01:00
|
|
|
return progress ? display(progress, n, 0) : 0;
|
2007-04-18 20:27:45 +02:00
|
|
|
}
|
|
|
|
|
2007-10-30 19:57:32 +01:00
|
|
|
struct progress *start_progress_delay(const char *title, unsigned total,
|
|
|
|
unsigned percent_treshold, unsigned delay)
|
2007-04-20 21:05:27 +02:00
|
|
|
{
|
2007-10-30 19:57:32 +01:00
|
|
|
struct progress *progress = malloc(sizeof(*progress));
|
|
|
|
if (!progress) {
|
|
|
|
/* unlikely, but here's a good fallback */
|
|
|
|
fprintf(stderr, "%s...\n", title);
|
|
|
|
return NULL;
|
|
|
|
}
|
2007-10-17 03:55:45 +02:00
|
|
|
progress->title = title;
|
2007-04-20 21:05:27 +02:00
|
|
|
progress->total = total;
|
2007-10-17 03:55:45 +02:00
|
|
|
progress->last_value = -1;
|
2007-04-20 21:05:27 +02:00
|
|
|
progress->last_percent = -1;
|
|
|
|
progress->delayed_percent_treshold = percent_treshold;
|
|
|
|
progress->delay = delay;
|
|
|
|
set_progress_signal();
|
2007-10-30 19:57:32 +01:00
|
|
|
return progress;
|
2007-04-20 21:05:27 +02:00
|
|
|
}
|
|
|
|
|
2007-10-30 19:57:32 +01:00
|
|
|
struct progress *start_progress(const char *title, unsigned total)
|
2007-10-17 03:55:45 +02:00
|
|
|
{
|
2007-10-30 19:57:32 +01:00
|
|
|
return start_progress_delay(title, total, 0, 0);
|
2007-10-17 03:55:45 +02:00
|
|
|
}
|
|
|
|
|
2007-10-30 19:57:32 +01:00
|
|
|
void stop_progress(struct progress **p_progress)
|
2007-04-18 20:27:45 +02:00
|
|
|
{
|
2007-10-30 19:57:32 +01:00
|
|
|
struct progress *progress = *p_progress;
|
|
|
|
if (!progress)
|
|
|
|
return;
|
|
|
|
*p_progress = NULL;
|
2007-10-17 03:55:45 +02:00
|
|
|
if (progress->last_value != -1) {
|
|
|
|
/* Force the last update */
|
|
|
|
progress_update = 1;
|
|
|
|
display(progress, progress->last_value, 1);
|
|
|
|
}
|
2007-04-18 20:27:45 +02:00
|
|
|
clear_progress_signal();
|
2007-10-30 19:57:32 +01:00
|
|
|
free(progress);
|
2007-04-18 20:27:45 +02:00
|
|
|
}
|