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"
|
2014-02-21 12:50:18 +00:00
|
|
|
#include "gettext.h"
|
2007-04-18 18:27:45 +00:00
|
|
|
#include "progress.h"
|
2013-04-10 19:03:23 +00:00
|
|
|
#include "strbuf.h"
|
2014-07-12 00:08:11 +00:00
|
|
|
#include "trace.h"
|
2007-04-18 18:27:45 +00:00
|
|
|
|
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;
|
2014-07-12 00:08:11 +00:00
|
|
|
uint64_t prev_ns;
|
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;
|
2015-09-24 21:05:57 +00:00
|
|
|
struct strbuf display;
|
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;
|
progress: simplify "delayed" progress API
We used to expose the full power of the delayed progress API to the
callers, so that they can specify, not just the message to show and
expected total amount of work that is used to compute the percentage
of work performed so far, the percent-threshold parameter P and the
delay-seconds parameter N. The progress meter starts to show at N
seconds into the operation only if we have not yet completed P per-cent
of the total work.
Most callers used either (0%, 2s) or (50%, 1s) as (P, N), but there
are oddballs that chose more random-looking values like 95%.
For a smoother workload, (50%, 1s) would allow us to start showing
the progress meter earlier than (0%, 2s), while keeping the chance
of not showing progress meter for long running operation the same as
the latter. For a task that would take 2s or more to complete, it
is likely that less than half of it would complete within the first
second, if the workload is smooth. But for a spiky workload whose
earlier part is easier, such a setting is likely to fail to show the
progress meter entirely and (0%, 2s) is more appropriate.
But that is merely a theory. Realistically, it is of dubious value
to ask each codepath to carefully consider smoothness of their
workload and specify their own setting by passing two extra
parameters. Let's simplify the API by dropping both parameters and
have everybody use (0%, 2s).
Oh, by the way, the percent-threshold parameter and the structure
member were consistently misspelled, which also is now fixed ;-)
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-19 17:39:41 +00:00
|
|
|
unsigned delayed_percent_threshold;
|
2007-10-30 18:57:34 +00:00
|
|
|
struct throughput *throughput;
|
2017-07-08 16:43:42 +00:00
|
|
|
uint64_t start_ns;
|
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;
|
|
|
|
}
|
|
|
|
|
2015-04-13 13:30:51 +00:00
|
|
|
static int is_foreground_fd(int fd)
|
|
|
|
{
|
2015-05-19 05:24:57 +00:00
|
|
|
int tpgrp = tcgetpgrp(fd);
|
|
|
|
return tpgrp < 0 || tpgrp == getpgid(0);
|
2015-04-13 13:30:51 +00:00
|
|
|
}
|
|
|
|
|
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;
|
progress: simplify "delayed" progress API
We used to expose the full power of the delayed progress API to the
callers, so that they can specify, not just the message to show and
expected total amount of work that is used to compute the percentage
of work performed so far, the percent-threshold parameter P and the
delay-seconds parameter N. The progress meter starts to show at N
seconds into the operation only if we have not yet completed P per-cent
of the total work.
Most callers used either (0%, 2s) or (50%, 1s) as (P, N), but there
are oddballs that chose more random-looking values like 95%.
For a smoother workload, (50%, 1s) would allow us to start showing
the progress meter earlier than (0%, 2s), while keeping the chance
of not showing progress meter for long running operation the same as
the latter. For a task that would take 2s or more to complete, it
is likely that less than half of it would complete within the first
second, if the workload is smooth. But for a spiky workload whose
earlier part is easier, such a setting is likely to fail to show the
progress meter entirely and (0%, 2s) is more appropriate.
But that is merely a theory. Realistically, it is of dubious value
to ask each codepath to carefully consider smoothness of their
workload and specify their own setting by passing two extra
parameters. Let's simplify the API by dropping both parameters and
have everybody use (0%, 2s).
Oh, by the way, the percent-threshold parameter and the structure
member were consistently misspelled, which also is now fixed ;-)
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-19 17:39:41 +00:00
|
|
|
if (percent > progress->delayed_percent_threshold) {
|
2007-04-20 19:05:27 +00:00
|
|
|
/* 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;
|
2015-09-24 21:05:57 +00:00
|
|
|
tp = (progress->throughput) ? progress->throughput->display.buf : "";
|
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;
|
2015-04-13 13:30:51 +00:00
|
|
|
if (is_foreground_fd(fileno(stderr)) || done) {
|
|
|
|
fprintf(stderr, "%s: %3u%% (%u/%u)%s%s",
|
|
|
|
progress->title, percent, n,
|
|
|
|
progress->total, tp, eol);
|
|
|
|
fflush(stderr);
|
|
|
|
}
|
2007-04-18 18:27:45 +00:00
|
|
|
progress_update = 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
} else if (progress_update) {
|
2015-04-13 13:30:51 +00:00
|
|
|
if (is_foreground_fd(fileno(stderr)) || done) {
|
|
|
|
fprintf(stderr, "%s: %u%s%s",
|
|
|
|
progress->title, n, tp, eol);
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2013-04-10 19:03:23 +00:00
|
|
|
static void throughput_string(struct strbuf *buf, off_t total,
|
2007-11-06 21:30:28 +00:00
|
|
|
unsigned int rate)
|
|
|
|
{
|
2015-09-24 21:05:57 +00:00
|
|
|
strbuf_reset(buf);
|
2013-04-10 19:03:23 +00:00
|
|
|
strbuf_addstr(buf, ", ");
|
|
|
|
strbuf_humanise_bytes(buf, total);
|
|
|
|
strbuf_addstr(buf, " | ");
|
|
|
|
strbuf_humanise_bytes(buf, rate * 1024);
|
|
|
|
strbuf_addstr(buf, "/s");
|
2007-11-06 21:30:28 +00:00
|
|
|
}
|
|
|
|
|
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;
|
2014-07-12 00:08:11 +00:00
|
|
|
uint64_t now_ns;
|
|
|
|
unsigned int misecs, count, rate;
|
2007-10-30 18:57:34 +00:00
|
|
|
|
|
|
|
if (!progress)
|
|
|
|
return;
|
|
|
|
tp = progress->throughput;
|
|
|
|
|
2014-07-12 00:08:11 +00:00
|
|
|
now_ns = getnanotime();
|
2007-10-30 18:57:34 +00:00
|
|
|
|
|
|
|
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;
|
2014-07-12 00:08:11 +00:00
|
|
|
tp->prev_ns = now_ns;
|
2015-09-24 21:05:57 +00:00
|
|
|
strbuf_init(&tp->display, 0);
|
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
|
|
|
|
2014-07-12 00:08:11 +00:00
|
|
|
/* only update throughput every 0.5 s */
|
|
|
|
if (now_ns - tp->prev_ns <= 500000000)
|
|
|
|
return;
|
|
|
|
|
2007-10-30 18:57:34 +00:00
|
|
|
/*
|
2014-07-12 00:08:11 +00:00
|
|
|
* We have x = bytes and y = nanosecs. We want z = KiB/s:
|
2007-10-30 18:57:34 +00:00
|
|
|
*
|
2014-07-12 00:08:11 +00:00
|
|
|
* z = (x / 1024) / (y / 1000000000)
|
|
|
|
* z = x / y * 1000000000 / 1024
|
|
|
|
* z = x / (y * 1024 / 1000000000)
|
2007-10-30 18:57:34 +00:00
|
|
|
* z = x / y'
|
|
|
|
*
|
|
|
|
* To simplify things we'll keep track of misecs, or 1024th of a sec
|
|
|
|
* obtained with:
|
|
|
|
*
|
2014-07-12 00:08:11 +00:00
|
|
|
* y' = y * 1024 / 1000000000
|
|
|
|
* y' = y * (2^10 / 2^42) * (2^42 / 1000000000)
|
|
|
|
* y' = y / 2^32 * 4398
|
|
|
|
* y' = (y * 4398) >> 32
|
2007-10-30 18:57:34 +00:00
|
|
|
*/
|
2014-07-12 00:08:11 +00:00
|
|
|
misecs = ((now_ns - tp->prev_ns) * 4398) >> 32;
|
|
|
|
|
|
|
|
count = total - tp->prev_total;
|
|
|
|
tp->prev_total = total;
|
|
|
|
tp->prev_ns = now_ns;
|
|
|
|
tp->avg_bytes += count;
|
|
|
|
tp->avg_misecs += misecs;
|
|
|
|
rate = tp->avg_bytes / tp->avg_misecs;
|
|
|
|
tp->avg_bytes -= tp->last_bytes[tp->idx];
|
|
|
|
tp->avg_misecs -= tp->last_misecs[tp->idx];
|
|
|
|
tp->last_bytes[tp->idx] = count;
|
|
|
|
tp->last_misecs[tp->idx] = misecs;
|
|
|
|
tp->idx = (tp->idx + 1) % TP_IDX_MAX;
|
|
|
|
|
2015-09-24 21:05:57 +00:00
|
|
|
throughput_string(&tp->display, total, rate);
|
2014-07-12 00:08:11 +00:00
|
|
|
if (progress->last_value != -1 && progress_update)
|
|
|
|
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
|
|
|
}
|
|
|
|
|
progress: simplify "delayed" progress API
We used to expose the full power of the delayed progress API to the
callers, so that they can specify, not just the message to show and
expected total amount of work that is used to compute the percentage
of work performed so far, the percent-threshold parameter P and the
delay-seconds parameter N. The progress meter starts to show at N
seconds into the operation only if we have not yet completed P per-cent
of the total work.
Most callers used either (0%, 2s) or (50%, 1s) as (P, N), but there
are oddballs that chose more random-looking values like 95%.
For a smoother workload, (50%, 1s) would allow us to start showing
the progress meter earlier than (0%, 2s), while keeping the chance
of not showing progress meter for long running operation the same as
the latter. For a task that would take 2s or more to complete, it
is likely that less than half of it would complete within the first
second, if the workload is smooth. But for a spiky workload whose
earlier part is easier, such a setting is likely to fail to show the
progress meter entirely and (0%, 2s) is more appropriate.
But that is merely a theory. Realistically, it is of dubious value
to ask each codepath to carefully consider smoothness of their
workload and specify their own setting by passing two extra
parameters. Let's simplify the API by dropping both parameters and
have everybody use (0%, 2s).
Oh, by the way, the percent-threshold parameter and the structure
member were consistently misspelled, which also is now fixed ;-)
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-19 17:39:41 +00:00
|
|
|
static struct progress *start_progress_delay(const char *title, unsigned total,
|
|
|
|
unsigned percent_threshold, 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: simplify "delayed" progress API
We used to expose the full power of the delayed progress API to the
callers, so that they can specify, not just the message to show and
expected total amount of work that is used to compute the percentage
of work performed so far, the percent-threshold parameter P and the
delay-seconds parameter N. The progress meter starts to show at N
seconds into the operation only if we have not yet completed P per-cent
of the total work.
Most callers used either (0%, 2s) or (50%, 1s) as (P, N), but there
are oddballs that chose more random-looking values like 95%.
For a smoother workload, (50%, 1s) would allow us to start showing
the progress meter earlier than (0%, 2s), while keeping the chance
of not showing progress meter for long running operation the same as
the latter. For a task that would take 2s or more to complete, it
is likely that less than half of it would complete within the first
second, if the workload is smooth. But for a spiky workload whose
earlier part is easier, such a setting is likely to fail to show the
progress meter entirely and (0%, 2s) is more appropriate.
But that is merely a theory. Realistically, it is of dubious value
to ask each codepath to carefully consider smoothness of their
workload and specify their own setting by passing two extra
parameters. Let's simplify the API by dropping both parameters and
have everybody use (0%, 2s).
Oh, by the way, the percent-threshold parameter and the structure
member were consistently misspelled, which also is now fixed ;-)
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-19 17:39:41 +00:00
|
|
|
progress->delayed_percent_threshold = percent_threshold;
|
2007-04-20 19:05:27 +00:00
|
|
|
progress->delay = delay;
|
2007-10-30 18:57:34 +00:00
|
|
|
progress->throughput = NULL;
|
2017-07-08 16:43:42 +00:00
|
|
|
progress->start_ns = getnanotime();
|
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
|
|
|
}
|
|
|
|
|
progress: simplify "delayed" progress API
We used to expose the full power of the delayed progress API to the
callers, so that they can specify, not just the message to show and
expected total amount of work that is used to compute the percentage
of work performed so far, the percent-threshold parameter P and the
delay-seconds parameter N. The progress meter starts to show at N
seconds into the operation only if we have not yet completed P per-cent
of the total work.
Most callers used either (0%, 2s) or (50%, 1s) as (P, N), but there
are oddballs that chose more random-looking values like 95%.
For a smoother workload, (50%, 1s) would allow us to start showing
the progress meter earlier than (0%, 2s), while keeping the chance
of not showing progress meter for long running operation the same as
the latter. For a task that would take 2s or more to complete, it
is likely that less than half of it would complete within the first
second, if the workload is smooth. But for a spiky workload whose
earlier part is easier, such a setting is likely to fail to show the
progress meter entirely and (0%, 2s) is more appropriate.
But that is merely a theory. Realistically, it is of dubious value
to ask each codepath to carefully consider smoothness of their
workload and specify their own setting by passing two extra
parameters. Let's simplify the API by dropping both parameters and
have everybody use (0%, 2s).
Oh, by the way, the percent-threshold parameter and the structure
member were consistently misspelled, which also is now fixed ;-)
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-08-19 17:39:41 +00:00
|
|
|
struct progress *start_delayed_progress(const char *title, unsigned total)
|
|
|
|
{
|
|
|
|
return start_progress_delay(title, total, 0, 2);
|
|
|
|
}
|
|
|
|
|
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
|
|
|
{
|
2014-02-21 12:50:18 +00:00
|
|
|
stop_progress_msg(p_progress, _("done"));
|
2007-11-08 20:45:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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 */
|
2017-02-16 17:07:13 +00:00
|
|
|
char *buf;
|
2007-11-06 21:30:28 +00:00
|
|
|
struct throughput *tp = progress->throughput;
|
2008-06-08 15:26:15 +00:00
|
|
|
|
2007-11-06 21:30:28 +00:00
|
|
|
if (tp) {
|
2017-07-08 16:43:42 +00:00
|
|
|
uint64_t now_ns = getnanotime();
|
|
|
|
unsigned int misecs, rate;
|
|
|
|
misecs = ((now_ns - progress->start_ns) * 4398) >> 32;
|
|
|
|
rate = tp->curr_total / (misecs ? misecs : 1);
|
2015-09-24 21:05:57 +00:00
|
|
|
throughput_string(&tp->display, tp->curr_total, rate);
|
2007-11-06 21:30:28 +00:00
|
|
|
}
|
2007-10-17 01:55:45 +00:00
|
|
|
progress_update = 1;
|
2017-02-16 17:07:13 +00:00
|
|
|
buf = xstrfmt(", %s.\n", msg);
|
|
|
|
display(progress, progress->last_value, buf);
|
|
|
|
free(buf);
|
2007-10-17 01:55:45 +00:00
|
|
|
}
|
2007-04-18 18:27:45 +00:00
|
|
|
clear_progress_signal();
|
2015-09-24 21:05:57 +00:00
|
|
|
if (progress->throughput)
|
|
|
|
strbuf_release(&progress->throughput->display);
|
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
|
|
|
}
|