Nicolas Pitre | 74b6792 | 2007-10-30 15:41:13 -0400 | [diff] [blame] | 1 | /* |
| 2 | * Simple text-based progress display module for GIT |
| 3 | * |
Nicolas Pitre | 03aa8ff | 2009-09-14 02:41:16 -0400 | [diff] [blame] | 4 | * Copyright (c) 2007 by Nicolas Pitre <nico@fluxnic.net> |
Nicolas Pitre | 74b6792 | 2007-10-30 15:41:13 -0400 | [diff] [blame] | 5 | * |
| 6 | * This code is free software; you can redistribute it and/or modify |
| 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation. |
| 9 | */ |
| 10 | |
Đoàn Trần Công Danh | 3cacb9a | 2020-04-27 21:22:37 +0700 | [diff] [blame] | 11 | #define GIT_TEST_PROGRESS_ONLY |
SZEDER Gábor | 545dc34 | 2019-04-12 21:45:15 +0200 | [diff] [blame] | 12 | #include "cache.h" |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 13 | #include "progress.h" |
Antoine Pelisse | 079b546 | 2013-04-10 21:03:23 +0200 | [diff] [blame] | 14 | #include "strbuf.h" |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 15 | #include "trace.h" |
SZEDER Gábor | 545dc34 | 2019-04-12 21:45:15 +0200 | [diff] [blame] | 16 | #include "utf8.h" |
Derrick Stolee | 44a4693 | 2019-11-25 21:28:22 +0000 | [diff] [blame] | 17 | #include "config.h" |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 18 | |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 19 | #define TP_IDX_MAX 8 |
| 20 | |
| 21 | struct throughput { |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 22 | off_t curr_total; |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 23 | off_t prev_total; |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 24 | uint64_t prev_ns; |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 25 | unsigned int avg_bytes; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 26 | unsigned int avg_misecs; |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 27 | unsigned int last_bytes[TP_IDX_MAX]; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 28 | unsigned int last_misecs[TP_IDX_MAX]; |
| 29 | unsigned int idx; |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 30 | struct strbuf display; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 31 | }; |
| 32 | |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 33 | struct progress { |
| 34 | const char *title; |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 35 | uint64_t last_value; |
| 36 | uint64_t total; |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 37 | unsigned last_percent; |
| 38 | unsigned delay; |
Jeff Hostetler | 9d81ecb | 2019-03-21 12:36:11 -0700 | [diff] [blame] | 39 | unsigned sparse; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 40 | struct throughput *throughput; |
René Scharfe | 0fae1e0 | 2017-07-08 18:43:42 +0200 | [diff] [blame] | 41 | uint64_t start_ns; |
SZEDER Gábor | d53ba84 | 2019-04-05 02:45:37 +0200 | [diff] [blame] | 42 | struct strbuf counters_sb; |
SZEDER Gábor | 545dc34 | 2019-04-12 21:45:15 +0200 | [diff] [blame] | 43 | int title_len; |
| 44 | int split; |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 45 | }; |
| 46 | |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 47 | static volatile sig_atomic_t progress_update; |
| 48 | |
SZEDER Gábor | 2bb74b5 | 2019-09-16 22:54:12 +0200 | [diff] [blame] | 49 | /* |
| 50 | * These are only intended for testing the progress output, i.e. exclusively |
| 51 | * for 'test-tool progress'. |
| 52 | */ |
| 53 | int progress_testing; |
| 54 | uint64_t progress_test_ns = 0; |
SZEDER Gábor | 2bb74b5 | 2019-09-16 22:54:12 +0200 | [diff] [blame] | 55 | void progress_test_force_update(void) |
| 56 | { |
| 57 | progress_update = 1; |
| 58 | } |
| 59 | |
| 60 | |
Jeff King | 9ec03b5 | 2023-02-24 01:39:20 -0500 | [diff] [blame] | 61 | static void progress_interval(int signum UNUSED) |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 62 | { |
| 63 | progress_update = 1; |
| 64 | } |
| 65 | |
| 66 | static void set_progress_signal(void) |
| 67 | { |
| 68 | struct sigaction sa; |
| 69 | struct itimerval v; |
| 70 | |
SZEDER Gábor | 2bb74b5 | 2019-09-16 22:54:12 +0200 | [diff] [blame] | 71 | if (progress_testing) |
| 72 | return; |
| 73 | |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 74 | progress_update = 0; |
| 75 | |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 76 | memset(&sa, 0, sizeof(sa)); |
| 77 | sa.sa_handler = progress_interval; |
| 78 | sigemptyset(&sa.sa_mask); |
| 79 | sa.sa_flags = SA_RESTART; |
| 80 | sigaction(SIGALRM, &sa, NULL); |
| 81 | |
| 82 | v.it_interval.tv_sec = 1; |
| 83 | v.it_interval.tv_usec = 0; |
| 84 | v.it_value = v.it_interval; |
| 85 | setitimer(ITIMER_REAL, &v, NULL); |
| 86 | } |
| 87 | |
| 88 | static void clear_progress_signal(void) |
| 89 | { |
| 90 | struct itimerval v = {{0,},}; |
SZEDER Gábor | 2bb74b5 | 2019-09-16 22:54:12 +0200 | [diff] [blame] | 91 | |
| 92 | if (progress_testing) |
| 93 | return; |
| 94 | |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 95 | setitimer(ITIMER_REAL, &v, NULL); |
| 96 | signal(SIGALRM, SIG_IGN); |
| 97 | progress_update = 0; |
| 98 | } |
| 99 | |
Luke Mewburn | 85cb890 | 2015-04-13 23:30:51 +1000 | [diff] [blame] | 100 | static int is_foreground_fd(int fd) |
| 101 | { |
Jeff King | a4fb76c | 2015-05-19 01:24:57 -0400 | [diff] [blame] | 102 | int tpgrp = tcgetpgrp(fd); |
| 103 | return tpgrp < 0 || tpgrp == getpgid(0); |
Luke Mewburn | 85cb890 | 2015-04-13 23:30:51 +1000 | [diff] [blame] | 104 | } |
| 105 | |
SZEDER Gábor | 9219d12 | 2019-04-05 02:45:36 +0200 | [diff] [blame] | 106 | static void display(struct progress *progress, uint64_t n, const char *done) |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 107 | { |
SZEDER Gábor | d53ba84 | 2019-04-05 02:45:37 +0200 | [diff] [blame] | 108 | const char *tp; |
| 109 | struct strbuf *counters_sb = &progress->counters_sb; |
| 110 | int show_update = 0; |
SZEDER Gábor | bbf4756 | 2019-09-16 22:54:11 +0200 | [diff] [blame] | 111 | int last_count_len = counters_sb->len; |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 112 | |
Lars Schneider | 9c5951c | 2017-12-04 17:07:00 -0500 | [diff] [blame] | 113 | if (progress->delay && (!progress_update || --progress->delay)) |
SZEDER Gábor | 9219d12 | 2019-04-05 02:45:36 +0200 | [diff] [blame] | 114 | return; |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 115 | |
| 116 | progress->last_value = n; |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 117 | tp = (progress->throughput) ? progress->throughput->display.buf : ""; |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 118 | if (progress->total) { |
| 119 | unsigned percent = n * 100 / progress->total; |
| 120 | if (percent != progress->last_percent || progress_update) { |
| 121 | progress->last_percent = percent; |
SZEDER Gábor | d53ba84 | 2019-04-05 02:45:37 +0200 | [diff] [blame] | 122 | |
| 123 | strbuf_reset(counters_sb); |
| 124 | strbuf_addf(counters_sb, |
| 125 | "%3u%% (%"PRIuMAX"/%"PRIuMAX")%s", percent, |
| 126 | (uintmax_t)n, (uintmax_t)progress->total, |
| 127 | tp); |
| 128 | show_update = 1; |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 129 | } |
| 130 | } else if (progress_update) { |
SZEDER Gábor | d53ba84 | 2019-04-05 02:45:37 +0200 | [diff] [blame] | 131 | strbuf_reset(counters_sb); |
| 132 | strbuf_addf(counters_sb, "%"PRIuMAX"%s", (uintmax_t)n, tp); |
| 133 | show_update = 1; |
| 134 | } |
| 135 | |
| 136 | if (show_update) { |
Luke Mewburn | 85cb890 | 2015-04-13 23:30:51 +1000 | [diff] [blame] | 137 | if (is_foreground_fd(fileno(stderr)) || done) { |
SZEDER Gábor | 9f1fd84 | 2019-04-12 21:45:14 +0200 | [diff] [blame] | 138 | const char *eol = done ? done : "\r"; |
SZEDER Gábor | bbf4756 | 2019-09-16 22:54:11 +0200 | [diff] [blame] | 139 | size_t clear_len = counters_sb->len < last_count_len ? |
| 140 | last_count_len - counters_sb->len + 1 : |
| 141 | 0; |
| 142 | /* The "+ 2" accounts for the ": ". */ |
| 143 | size_t progress_line_len = progress->title_len + |
| 144 | counters_sb->len + 2; |
| 145 | int cols = term_columns(); |
SZEDER Gábor | 545dc34 | 2019-04-12 21:45:15 +0200 | [diff] [blame] | 146 | |
| 147 | if (progress->split) { |
SZEDER Gábor | bbf4756 | 2019-09-16 22:54:11 +0200 | [diff] [blame] | 148 | fprintf(stderr, " %s%*s", counters_sb->buf, |
| 149 | (int) clear_len, eol); |
| 150 | } else if (!done && cols < progress_line_len) { |
| 151 | clear_len = progress->title_len + 1 < cols ? |
| 152 | cols - progress->title_len - 1 : 0; |
| 153 | fprintf(stderr, "%s:%*s\n %s%s", |
| 154 | progress->title, (int) clear_len, "", |
| 155 | counters_sb->buf, eol); |
SZEDER Gábor | 545dc34 | 2019-04-12 21:45:15 +0200 | [diff] [blame] | 156 | progress->split = 1; |
| 157 | } else { |
SZEDER Gábor | bbf4756 | 2019-09-16 22:54:11 +0200 | [diff] [blame] | 158 | fprintf(stderr, "%s: %s%*s", progress->title, |
| 159 | counters_sb->buf, (int) clear_len, eol); |
SZEDER Gábor | 545dc34 | 2019-04-12 21:45:15 +0200 | [diff] [blame] | 160 | } |
Luke Mewburn | 85cb890 | 2015-04-13 23:30:51 +1000 | [diff] [blame] | 161 | fflush(stderr); |
| 162 | } |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 163 | progress_update = 0; |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 164 | } |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 165 | } |
| 166 | |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 167 | static void throughput_string(struct strbuf *buf, uint64_t total, |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 168 | unsigned int rate) |
| 169 | { |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 170 | strbuf_reset(buf); |
Antoine Pelisse | 079b546 | 2013-04-10 21:03:23 +0200 | [diff] [blame] | 171 | strbuf_addstr(buf, ", "); |
| 172 | strbuf_humanise_bytes(buf, total); |
| 173 | strbuf_addstr(buf, " | "); |
Dimitriy Ryazantcev | 8f354a1 | 2019-07-02 21:22:48 +0300 | [diff] [blame] | 174 | strbuf_humanise_rate(buf, rate * 1024); |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 175 | } |
| 176 | |
SZEDER Gábor | 2bb74b5 | 2019-09-16 22:54:12 +0200 | [diff] [blame] | 177 | static uint64_t progress_getnanotime(struct progress *progress) |
| 178 | { |
| 179 | if (progress_testing) |
| 180 | return progress->start_ns + progress_test_ns; |
| 181 | else |
| 182 | return getnanotime(); |
| 183 | } |
| 184 | |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 185 | void display_throughput(struct progress *progress, uint64_t total) |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 186 | { |
| 187 | struct throughput *tp; |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 188 | uint64_t now_ns; |
| 189 | unsigned int misecs, count, rate; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 190 | |
| 191 | if (!progress) |
| 192 | return; |
| 193 | tp = progress->throughput; |
| 194 | |
SZEDER Gábor | 2bb74b5 | 2019-09-16 22:54:12 +0200 | [diff] [blame] | 195 | now_ns = progress_getnanotime(progress); |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 196 | |
| 197 | if (!tp) { |
René Scharfe | ca56dad | 2021-03-13 17:17:22 +0100 | [diff] [blame] | 198 | progress->throughput = CALLOC_ARRAY(tp, 1); |
Jeff King | 999b951 | 2019-04-11 09:49:57 -0400 | [diff] [blame] | 199 | tp->prev_total = tp->curr_total = total; |
| 200 | tp->prev_ns = now_ns; |
| 201 | strbuf_init(&tp->display, 0); |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 202 | return; |
| 203 | } |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 204 | tp->curr_total = total; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 205 | |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 206 | /* only update throughput every 0.5 s */ |
| 207 | if (now_ns - tp->prev_ns <= 500000000) |
| 208 | return; |
| 209 | |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 210 | /* |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 211 | * We have x = bytes and y = nanosecs. We want z = KiB/s: |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 212 | * |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 213 | * z = (x / 1024) / (y / 1000000000) |
| 214 | * z = x / y * 1000000000 / 1024 |
| 215 | * z = x / (y * 1024 / 1000000000) |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 216 | * z = x / y' |
| 217 | * |
| 218 | * To simplify things we'll keep track of misecs, or 1024th of a sec |
| 219 | * obtained with: |
| 220 | * |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 221 | * y' = y * 1024 / 1000000000 |
| 222 | * y' = y * (2^10 / 2^42) * (2^42 / 1000000000) |
| 223 | * y' = y / 2^32 * 4398 |
| 224 | * y' = (y * 4398) >> 32 |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 225 | */ |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 226 | misecs = ((now_ns - tp->prev_ns) * 4398) >> 32; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 227 | |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 228 | count = total - tp->prev_total; |
| 229 | tp->prev_total = total; |
| 230 | tp->prev_ns = now_ns; |
| 231 | tp->avg_bytes += count; |
| 232 | tp->avg_misecs += misecs; |
| 233 | rate = tp->avg_bytes / tp->avg_misecs; |
| 234 | tp->avg_bytes -= tp->last_bytes[tp->idx]; |
| 235 | tp->avg_misecs -= tp->last_misecs[tp->idx]; |
| 236 | tp->last_bytes[tp->idx] = count; |
| 237 | tp->last_misecs[tp->idx] = misecs; |
| 238 | tp->idx = (tp->idx + 1) % TP_IDX_MAX; |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 239 | |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 240 | throughput_string(&tp->display, total, rate); |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 241 | if (progress->last_value != -1 && progress_update) |
| 242 | display(progress, progress->last_value, NULL); |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 243 | } |
| 244 | |
SZEDER Gábor | 9219d12 | 2019-04-05 02:45:36 +0200 | [diff] [blame] | 245 | void display_progress(struct progress *progress, uint64_t n) |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 246 | { |
SZEDER Gábor | 9219d12 | 2019-04-05 02:45:36 +0200 | [diff] [blame] | 247 | if (progress) |
| 248 | display(progress, n, NULL); |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 249 | } |
| 250 | |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 251 | static struct progress *start_progress_delay(const char *title, uint64_t total, |
Jeff Hostetler | 9d81ecb | 2019-03-21 12:36:11 -0700 | [diff] [blame] | 252 | unsigned delay, unsigned sparse) |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 253 | { |
Jeff King | 999b951 | 2019-04-11 09:49:57 -0400 | [diff] [blame] | 254 | struct progress *progress = xmalloc(sizeof(*progress)); |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 255 | progress->title = title; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 256 | progress->total = total; |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 257 | progress->last_value = -1; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 258 | progress->last_percent = -1; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 259 | progress->delay = delay; |
Jeff Hostetler | 9d81ecb | 2019-03-21 12:36:11 -0700 | [diff] [blame] | 260 | progress->sparse = sparse; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 261 | progress->throughput = NULL; |
René Scharfe | 0fae1e0 | 2017-07-08 18:43:42 +0200 | [diff] [blame] | 262 | progress->start_ns = getnanotime(); |
SZEDER Gábor | d53ba84 | 2019-04-05 02:45:37 +0200 | [diff] [blame] | 263 | strbuf_init(&progress->counters_sb, 0); |
SZEDER Gábor | 545dc34 | 2019-04-12 21:45:15 +0200 | [diff] [blame] | 264 | progress->title_len = utf8_strwidth(title); |
| 265 | progress->split = 0; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 266 | set_progress_signal(); |
Emily Shaffer | 98a1364 | 2020-05-12 14:44:20 -0700 | [diff] [blame] | 267 | trace2_region_enter("progress", title, the_repository); |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 268 | return progress; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 269 | } |
| 270 | |
Derrick Stolee | 44a4693 | 2019-11-25 21:28:22 +0000 | [diff] [blame] | 271 | static int get_default_delay(void) |
| 272 | { |
| 273 | static int delay_in_secs = -1; |
| 274 | |
| 275 | if (delay_in_secs < 0) |
| 276 | delay_in_secs = git_env_ulong("GIT_PROGRESS_DELAY", 2); |
| 277 | |
| 278 | return delay_in_secs; |
| 279 | } |
| 280 | |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 281 | struct progress *start_delayed_progress(const char *title, uint64_t total) |
Junio C Hamano | 8aade10 | 2017-08-19 10:39:41 -0700 | [diff] [blame] | 282 | { |
Derrick Stolee | 44a4693 | 2019-11-25 21:28:22 +0000 | [diff] [blame] | 283 | return start_progress_delay(title, total, get_default_delay(), 0); |
Junio C Hamano | 8aade10 | 2017-08-19 10:39:41 -0700 | [diff] [blame] | 284 | } |
| 285 | |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 286 | struct progress *start_progress(const char *title, uint64_t total) |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 287 | { |
Jeff Hostetler | 9d81ecb | 2019-03-21 12:36:11 -0700 | [diff] [blame] | 288 | return start_progress_delay(title, total, 0, 0); |
| 289 | } |
| 290 | |
| 291 | /* |
| 292 | * Here "sparse" means that the caller might use some sampling criteria to |
| 293 | * decide when to call display_progress() rather than calling it for every |
| 294 | * integer value in[0 .. total). In particular, the caller might not call |
| 295 | * display_progress() for the last value in the range. |
| 296 | * |
| 297 | * When "sparse" is set, stop_progress() will automatically force the done |
| 298 | * message to show 100%. |
| 299 | */ |
| 300 | struct progress *start_sparse_progress(const char *title, uint64_t total) |
| 301 | { |
| 302 | return start_progress_delay(title, total, 0, 1); |
| 303 | } |
| 304 | |
| 305 | struct progress *start_delayed_sparse_progress(const char *title, |
| 306 | uint64_t total) |
| 307 | { |
Derrick Stolee | 44a4693 | 2019-11-25 21:28:22 +0000 | [diff] [blame] | 308 | return start_progress_delay(title, total, get_default_delay(), 1); |
Jeff Hostetler | 9d81ecb | 2019-03-21 12:36:11 -0700 | [diff] [blame] | 309 | } |
| 310 | |
| 311 | static void finish_if_sparse(struct progress *progress) |
| 312 | { |
Ævar Arnfjörð Bjarmason | 74900a6 | 2022-02-03 22:40:18 +0100 | [diff] [blame] | 313 | if (progress->sparse && |
Jeff Hostetler | 9d81ecb | 2019-03-21 12:36:11 -0700 | [diff] [blame] | 314 | progress->last_value != progress->total) |
| 315 | display_progress(progress, progress->total); |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 316 | } |
| 317 | |
Ævar Arnfjörð Bjarmason | accf1eb | 2022-02-03 22:40:17 +0100 | [diff] [blame] | 318 | static void force_last_update(struct progress *progress, const char *msg) |
| 319 | { |
| 320 | char *buf; |
| 321 | struct throughput *tp = progress->throughput; |
| 322 | |
| 323 | if (tp) { |
| 324 | uint64_t now_ns = progress_getnanotime(progress); |
| 325 | unsigned int misecs, rate; |
| 326 | misecs = ((now_ns - progress->start_ns) * 4398) >> 32; |
| 327 | rate = tp->curr_total / (misecs ? misecs : 1); |
| 328 | throughput_string(&tp->display, tp->curr_total, rate); |
| 329 | } |
| 330 | progress_update = 1; |
| 331 | buf = xstrfmt(", %s.\n", msg); |
| 332 | display(progress, progress->last_value, buf); |
| 333 | free(buf); |
| 334 | } |
| 335 | |
| 336 | static void log_trace2(struct progress *progress) |
| 337 | { |
| 338 | trace2_data_intmax("progress", the_repository, "total_objects", |
| 339 | progress->total); |
| 340 | |
| 341 | if (progress->throughput) |
| 342 | trace2_data_intmax("progress", the_repository, "total_bytes", |
| 343 | progress->throughput->curr_total); |
| 344 | |
| 345 | trace2_region_leave("progress", progress->title, the_repository); |
| 346 | } |
| 347 | |
Nicolas Pitre | a984a06 | 2007-11-08 15:45:41 -0500 | [diff] [blame] | 348 | void stop_progress_msg(struct progress **p_progress, const char *msg) |
| 349 | { |
Martin Ågren | ac900fd | 2020-08-10 21:47:48 +0200 | [diff] [blame] | 350 | struct progress *progress; |
| 351 | |
| 352 | if (!p_progress) |
| 353 | BUG("don't provide NULL to stop_progress_msg"); |
| 354 | |
| 355 | progress = *p_progress; |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 356 | if (!progress) |
| 357 | return; |
| 358 | *p_progress = NULL; |
Boyd Lynn Gerber | d4c4444 | 2008-06-08 09:26:15 -0600 | [diff] [blame] | 359 | |
Ævar Arnfjörð Bjarmason | 74900a6 | 2022-02-03 22:40:18 +0100 | [diff] [blame] | 360 | finish_if_sparse(progress); |
Ævar Arnfjörð Bjarmason | accf1eb | 2022-02-03 22:40:17 +0100 | [diff] [blame] | 361 | if (progress->last_value != -1) |
| 362 | force_last_update(progress, msg); |
Ævar Arnfjörð Bjarmason | 74900a6 | 2022-02-03 22:40:18 +0100 | [diff] [blame] | 363 | log_trace2(progress); |
Ævar Arnfjörð Bjarmason | accf1eb | 2022-02-03 22:40:17 +0100 | [diff] [blame] | 364 | |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 365 | clear_progress_signal(); |
SZEDER Gábor | d53ba84 | 2019-04-05 02:45:37 +0200 | [diff] [blame] | 366 | strbuf_release(&progress->counters_sb); |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 367 | if (progress->throughput) |
| 368 | strbuf_release(&progress->throughput->display); |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 369 | free(progress->throughput); |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 370 | free(progress); |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 371 | } |