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 | |
SZEDER Gábor | 545dc34 | 2019-04-12 21:45:15 +0200 | [diff] [blame] | 11 | #include "cache.h" |
Nguyễn Thái Ngọc Duy | 754dbc4 | 2014-02-21 19:50:18 +0700 | [diff] [blame] | 12 | #include "gettext.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" |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 17 | |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 18 | #define TP_IDX_MAX 8 |
| 19 | |
| 20 | struct throughput { |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 21 | off_t curr_total; |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 22 | off_t prev_total; |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 23 | uint64_t prev_ns; |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 24 | unsigned int avg_bytes; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 25 | unsigned int avg_misecs; |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 26 | unsigned int last_bytes[TP_IDX_MAX]; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 27 | unsigned int last_misecs[TP_IDX_MAX]; |
| 28 | unsigned int idx; |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 29 | struct strbuf display; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 30 | }; |
| 31 | |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 32 | struct progress { |
| 33 | const char *title; |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 34 | uint64_t last_value; |
| 35 | uint64_t total; |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 36 | unsigned last_percent; |
| 37 | unsigned delay; |
Jeff Hostetler | 9d81ecb | 2019-03-21 12:36:11 -0700 | [diff] [blame] | 38 | unsigned sparse; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 39 | struct throughput *throughput; |
René Scharfe | 0fae1e0 | 2017-07-08 18:43:42 +0200 | [diff] [blame] | 40 | uint64_t start_ns; |
SZEDER Gábor | d53ba84 | 2019-04-05 02:45:37 +0200 | [diff] [blame] | 41 | struct strbuf counters_sb; |
SZEDER Gábor | 545dc34 | 2019-04-12 21:45:15 +0200 | [diff] [blame] | 42 | int title_len; |
| 43 | int split; |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 44 | }; |
| 45 | |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 46 | static volatile sig_atomic_t progress_update; |
| 47 | |
| 48 | static void progress_interval(int signum) |
| 49 | { |
| 50 | progress_update = 1; |
| 51 | } |
| 52 | |
| 53 | static void set_progress_signal(void) |
| 54 | { |
| 55 | struct sigaction sa; |
| 56 | struct itimerval v; |
| 57 | |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 58 | progress_update = 0; |
| 59 | |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 60 | memset(&sa, 0, sizeof(sa)); |
| 61 | sa.sa_handler = progress_interval; |
| 62 | sigemptyset(&sa.sa_mask); |
| 63 | sa.sa_flags = SA_RESTART; |
| 64 | sigaction(SIGALRM, &sa, NULL); |
| 65 | |
| 66 | v.it_interval.tv_sec = 1; |
| 67 | v.it_interval.tv_usec = 0; |
| 68 | v.it_value = v.it_interval; |
| 69 | setitimer(ITIMER_REAL, &v, NULL); |
| 70 | } |
| 71 | |
| 72 | static void clear_progress_signal(void) |
| 73 | { |
| 74 | struct itimerval v = {{0,},}; |
| 75 | setitimer(ITIMER_REAL, &v, NULL); |
| 76 | signal(SIGALRM, SIG_IGN); |
| 77 | progress_update = 0; |
| 78 | } |
| 79 | |
Luke Mewburn | 85cb890 | 2015-04-13 23:30:51 +1000 | [diff] [blame] | 80 | static int is_foreground_fd(int fd) |
| 81 | { |
Jeff King | a4fb76c | 2015-05-19 01:24:57 -0400 | [diff] [blame] | 82 | int tpgrp = tcgetpgrp(fd); |
| 83 | return tpgrp < 0 || tpgrp == getpgid(0); |
Luke Mewburn | 85cb890 | 2015-04-13 23:30:51 +1000 | [diff] [blame] | 84 | } |
| 85 | |
SZEDER Gábor | 9219d12 | 2019-04-05 02:45:36 +0200 | [diff] [blame] | 86 | static void display(struct progress *progress, uint64_t n, const char *done) |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 87 | { |
SZEDER Gábor | d53ba84 | 2019-04-05 02:45:37 +0200 | [diff] [blame] | 88 | const char *tp; |
| 89 | struct strbuf *counters_sb = &progress->counters_sb; |
| 90 | int show_update = 0; |
SZEDER Gábor | 9f1fd84 | 2019-04-12 21:45:14 +0200 | [diff] [blame] | 91 | int last_count_len = counters_sb->len; |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 92 | |
Lars Schneider | 9c5951c | 2017-12-04 17:07:00 -0500 | [diff] [blame] | 93 | if (progress->delay && (!progress_update || --progress->delay)) |
SZEDER Gábor | 9219d12 | 2019-04-05 02:45:36 +0200 | [diff] [blame] | 94 | return; |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 95 | |
| 96 | progress->last_value = n; |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 97 | tp = (progress->throughput) ? progress->throughput->display.buf : ""; |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 98 | if (progress->total) { |
| 99 | unsigned percent = n * 100 / progress->total; |
| 100 | if (percent != progress->last_percent || progress_update) { |
| 101 | progress->last_percent = percent; |
SZEDER Gábor | d53ba84 | 2019-04-05 02:45:37 +0200 | [diff] [blame] | 102 | |
| 103 | strbuf_reset(counters_sb); |
| 104 | strbuf_addf(counters_sb, |
| 105 | "%3u%% (%"PRIuMAX"/%"PRIuMAX")%s", percent, |
| 106 | (uintmax_t)n, (uintmax_t)progress->total, |
| 107 | tp); |
| 108 | show_update = 1; |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 109 | } |
| 110 | } else if (progress_update) { |
SZEDER Gábor | d53ba84 | 2019-04-05 02:45:37 +0200 | [diff] [blame] | 111 | strbuf_reset(counters_sb); |
| 112 | strbuf_addf(counters_sb, "%"PRIuMAX"%s", (uintmax_t)n, tp); |
| 113 | show_update = 1; |
| 114 | } |
| 115 | |
| 116 | if (show_update) { |
Luke Mewburn | 85cb890 | 2015-04-13 23:30:51 +1000 | [diff] [blame] | 117 | if (is_foreground_fd(fileno(stderr)) || done) { |
SZEDER Gábor | 9f1fd84 | 2019-04-12 21:45:14 +0200 | [diff] [blame] | 118 | const char *eol = done ? done : "\r"; |
| 119 | size_t clear_len = counters_sb->len < last_count_len ? |
| 120 | last_count_len - counters_sb->len + 1 : |
| 121 | 0; |
SZEDER Gábor | 545dc34 | 2019-04-12 21:45:15 +0200 | [diff] [blame] | 122 | size_t progress_line_len = progress->title_len + |
| 123 | counters_sb->len + 2; |
| 124 | int cols = term_columns(); |
| 125 | |
| 126 | if (progress->split) { |
| 127 | fprintf(stderr, " %s%*s", counters_sb->buf, |
| 128 | (int) clear_len, eol); |
| 129 | } else if (!done && cols < progress_line_len) { |
| 130 | clear_len = progress->title_len + 1 < cols ? |
SZEDER Gábor | 1aed1a5 | 2019-05-19 16:45:46 +0200 | [diff] [blame] | 131 | cols - progress->title_len - 1 : 0; |
SZEDER Gábor | 545dc34 | 2019-04-12 21:45:15 +0200 | [diff] [blame] | 132 | fprintf(stderr, "%s:%*s\n %s%s", |
| 133 | progress->title, (int) clear_len, "", |
| 134 | counters_sb->buf, eol); |
| 135 | progress->split = 1; |
| 136 | } else { |
| 137 | fprintf(stderr, "%s: %s%*s", progress->title, |
| 138 | counters_sb->buf, (int) clear_len, eol); |
| 139 | } |
Luke Mewburn | 85cb890 | 2015-04-13 23:30:51 +1000 | [diff] [blame] | 140 | fflush(stderr); |
| 141 | } |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 142 | progress_update = 0; |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 143 | } |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 144 | } |
| 145 | |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 146 | static void throughput_string(struct strbuf *buf, uint64_t total, |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 147 | unsigned int rate) |
| 148 | { |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 149 | strbuf_reset(buf); |
Antoine Pelisse | 079b546 | 2013-04-10 21:03:23 +0200 | [diff] [blame] | 150 | strbuf_addstr(buf, ", "); |
| 151 | strbuf_humanise_bytes(buf, total); |
| 152 | strbuf_addstr(buf, " | "); |
| 153 | strbuf_humanise_bytes(buf, rate * 1024); |
| 154 | strbuf_addstr(buf, "/s"); |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 155 | } |
| 156 | |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 157 | void display_throughput(struct progress *progress, uint64_t total) |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 158 | { |
| 159 | struct throughput *tp; |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 160 | uint64_t now_ns; |
| 161 | unsigned int misecs, count, rate; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 162 | |
| 163 | if (!progress) |
| 164 | return; |
| 165 | tp = progress->throughput; |
| 166 | |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 167 | now_ns = getnanotime(); |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 168 | |
| 169 | if (!tp) { |
Jeff King | 999b951 | 2019-04-11 09:49:57 -0400 | [diff] [blame] | 170 | progress->throughput = tp = xcalloc(1, sizeof(*tp)); |
| 171 | tp->prev_total = tp->curr_total = total; |
| 172 | tp->prev_ns = now_ns; |
| 173 | strbuf_init(&tp->display, 0); |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 174 | return; |
| 175 | } |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 176 | tp->curr_total = total; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 177 | |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 178 | /* only update throughput every 0.5 s */ |
| 179 | if (now_ns - tp->prev_ns <= 500000000) |
| 180 | return; |
| 181 | |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 182 | /* |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 183 | * We have x = bytes and y = nanosecs. We want z = KiB/s: |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 184 | * |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 185 | * z = (x / 1024) / (y / 1000000000) |
| 186 | * z = x / y * 1000000000 / 1024 |
| 187 | * z = x / (y * 1024 / 1000000000) |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 188 | * z = x / y' |
| 189 | * |
| 190 | * To simplify things we'll keep track of misecs, or 1024th of a sec |
| 191 | * obtained with: |
| 192 | * |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 193 | * y' = y * 1024 / 1000000000 |
| 194 | * y' = y * (2^10 / 2^42) * (2^42 / 1000000000) |
| 195 | * y' = y / 2^32 * 4398 |
| 196 | * y' = (y * 4398) >> 32 |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 197 | */ |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 198 | misecs = ((now_ns - tp->prev_ns) * 4398) >> 32; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 199 | |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 200 | count = total - tp->prev_total; |
| 201 | tp->prev_total = total; |
| 202 | tp->prev_ns = now_ns; |
| 203 | tp->avg_bytes += count; |
| 204 | tp->avg_misecs += misecs; |
| 205 | rate = tp->avg_bytes / tp->avg_misecs; |
| 206 | tp->avg_bytes -= tp->last_bytes[tp->idx]; |
| 207 | tp->avg_misecs -= tp->last_misecs[tp->idx]; |
| 208 | tp->last_bytes[tp->idx] = count; |
| 209 | tp->last_misecs[tp->idx] = misecs; |
| 210 | tp->idx = (tp->idx + 1) % TP_IDX_MAX; |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 211 | |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 212 | throughput_string(&tp->display, total, rate); |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 213 | if (progress->last_value != -1 && progress_update) |
| 214 | display(progress, progress->last_value, NULL); |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 215 | } |
| 216 | |
SZEDER Gábor | 9219d12 | 2019-04-05 02:45:36 +0200 | [diff] [blame] | 217 | void display_progress(struct progress *progress, uint64_t n) |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 218 | { |
SZEDER Gábor | 9219d12 | 2019-04-05 02:45:36 +0200 | [diff] [blame] | 219 | if (progress) |
| 220 | display(progress, n, NULL); |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 221 | } |
| 222 | |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 223 | static struct progress *start_progress_delay(const char *title, uint64_t total, |
Jeff Hostetler | 9d81ecb | 2019-03-21 12:36:11 -0700 | [diff] [blame] | 224 | unsigned delay, unsigned sparse) |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 225 | { |
Jeff King | 999b951 | 2019-04-11 09:49:57 -0400 | [diff] [blame] | 226 | struct progress *progress = xmalloc(sizeof(*progress)); |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 227 | progress->title = title; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 228 | progress->total = total; |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 229 | progress->last_value = -1; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 230 | progress->last_percent = -1; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 231 | progress->delay = delay; |
Jeff Hostetler | 9d81ecb | 2019-03-21 12:36:11 -0700 | [diff] [blame] | 232 | progress->sparse = sparse; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 233 | progress->throughput = NULL; |
René Scharfe | 0fae1e0 | 2017-07-08 18:43:42 +0200 | [diff] [blame] | 234 | progress->start_ns = getnanotime(); |
SZEDER Gábor | d53ba84 | 2019-04-05 02:45:37 +0200 | [diff] [blame] | 235 | strbuf_init(&progress->counters_sb, 0); |
SZEDER Gábor | 545dc34 | 2019-04-12 21:45:15 +0200 | [diff] [blame] | 236 | progress->title_len = utf8_strwidth(title); |
| 237 | progress->split = 0; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 238 | set_progress_signal(); |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 239 | return progress; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 240 | } |
| 241 | |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 242 | struct progress *start_delayed_progress(const char *title, uint64_t total) |
Junio C Hamano | 8aade10 | 2017-08-19 10:39:41 -0700 | [diff] [blame] | 243 | { |
Jeff Hostetler | 9d81ecb | 2019-03-21 12:36:11 -0700 | [diff] [blame] | 244 | return start_progress_delay(title, total, 2, 0); |
Junio C Hamano | 8aade10 | 2017-08-19 10:39:41 -0700 | [diff] [blame] | 245 | } |
| 246 | |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 247 | struct progress *start_progress(const char *title, uint64_t total) |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 248 | { |
Jeff Hostetler | 9d81ecb | 2019-03-21 12:36:11 -0700 | [diff] [blame] | 249 | return start_progress_delay(title, total, 0, 0); |
| 250 | } |
| 251 | |
| 252 | /* |
| 253 | * Here "sparse" means that the caller might use some sampling criteria to |
| 254 | * decide when to call display_progress() rather than calling it for every |
| 255 | * integer value in[0 .. total). In particular, the caller might not call |
| 256 | * display_progress() for the last value in the range. |
| 257 | * |
| 258 | * When "sparse" is set, stop_progress() will automatically force the done |
| 259 | * message to show 100%. |
| 260 | */ |
| 261 | struct progress *start_sparse_progress(const char *title, uint64_t total) |
| 262 | { |
| 263 | return start_progress_delay(title, total, 0, 1); |
| 264 | } |
| 265 | |
| 266 | struct progress *start_delayed_sparse_progress(const char *title, |
| 267 | uint64_t total) |
| 268 | { |
| 269 | return start_progress_delay(title, total, 2, 1); |
| 270 | } |
| 271 | |
| 272 | static void finish_if_sparse(struct progress *progress) |
| 273 | { |
| 274 | if (progress && |
| 275 | progress->sparse && |
| 276 | progress->last_value != progress->total) |
| 277 | display_progress(progress, progress->total); |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 278 | } |
| 279 | |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 280 | void stop_progress(struct progress **p_progress) |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 281 | { |
Jeff Hostetler | 9d81ecb | 2019-03-21 12:36:11 -0700 | [diff] [blame] | 282 | finish_if_sparse(*p_progress); |
| 283 | |
Nguyễn Thái Ngọc Duy | 754dbc4 | 2014-02-21 19:50:18 +0700 | [diff] [blame] | 284 | stop_progress_msg(p_progress, _("done")); |
Nicolas Pitre | a984a06 | 2007-11-08 15:45:41 -0500 | [diff] [blame] | 285 | } |
| 286 | |
| 287 | void stop_progress_msg(struct progress **p_progress, const char *msg) |
| 288 | { |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 289 | struct progress *progress = *p_progress; |
| 290 | if (!progress) |
| 291 | return; |
| 292 | *p_progress = NULL; |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 293 | if (progress->last_value != -1) { |
| 294 | /* Force the last update */ |
Maxim Moseychuk | fbd0943 | 2017-02-16 20:07:13 +0300 | [diff] [blame] | 295 | char *buf; |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 296 | struct throughput *tp = progress->throughput; |
Boyd Lynn Gerber | d4c4444 | 2008-06-08 09:26:15 -0600 | [diff] [blame] | 297 | |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 298 | if (tp) { |
René Scharfe | 0fae1e0 | 2017-07-08 18:43:42 +0200 | [diff] [blame] | 299 | uint64_t now_ns = getnanotime(); |
| 300 | unsigned int misecs, rate; |
| 301 | misecs = ((now_ns - progress->start_ns) * 4398) >> 32; |
| 302 | rate = tp->curr_total / (misecs ? misecs : 1); |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 303 | throughput_string(&tp->display, tp->curr_total, rate); |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 304 | } |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 305 | progress_update = 1; |
Maxim Moseychuk | fbd0943 | 2017-02-16 20:07:13 +0300 | [diff] [blame] | 306 | buf = xstrfmt(", %s.\n", msg); |
| 307 | display(progress, progress->last_value, buf); |
| 308 | free(buf); |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 309 | } |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 310 | clear_progress_signal(); |
SZEDER Gábor | d53ba84 | 2019-04-05 02:45:37 +0200 | [diff] [blame] | 311 | strbuf_release(&progress->counters_sb); |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 312 | if (progress->throughput) |
| 313 | strbuf_release(&progress->throughput->display); |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 314 | free(progress->throughput); |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 315 | free(progress); |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 316 | } |