Nicolas Pitre | 74b6792 | 2007-10-30 15:41:13 -0400 | [diff] [blame] | 1 | /* |
| 2 | * Simple text-based progress display module for GIT |
| 3 | * |
| 4 | * Copyright (c) 2007 by Nicolas Pitre <nico@cam.org> |
| 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 | |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 11 | #include "git-compat-util.h" |
| 12 | #include "progress.h" |
| 13 | |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 14 | #define TP_IDX_MAX 8 |
| 15 | |
| 16 | struct throughput { |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 17 | off_t curr_total; |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 18 | off_t prev_total; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 19 | struct timeval prev_tv; |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 20 | unsigned int avg_bytes; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 21 | unsigned int avg_misecs; |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 22 | unsigned int last_bytes[TP_IDX_MAX]; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 23 | unsigned int last_misecs[TP_IDX_MAX]; |
| 24 | unsigned int idx; |
Nicolas Pitre | 81f6654 | 2007-11-01 16:59:57 -0400 | [diff] [blame] | 25 | char display[32]; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 26 | }; |
| 27 | |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 28 | struct progress { |
| 29 | const char *title; |
| 30 | int last_value; |
| 31 | unsigned total; |
| 32 | unsigned last_percent; |
| 33 | unsigned delay; |
| 34 | unsigned delayed_percent_treshold; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 35 | struct throughput *throughput; |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 36 | }; |
| 37 | |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 38 | static volatile sig_atomic_t progress_update; |
| 39 | |
| 40 | static void progress_interval(int signum) |
| 41 | { |
| 42 | progress_update = 1; |
| 43 | } |
| 44 | |
| 45 | static void set_progress_signal(void) |
| 46 | { |
| 47 | struct sigaction sa; |
| 48 | struct itimerval v; |
| 49 | |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 50 | progress_update = 0; |
| 51 | |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 52 | memset(&sa, 0, sizeof(sa)); |
| 53 | sa.sa_handler = progress_interval; |
| 54 | sigemptyset(&sa.sa_mask); |
| 55 | sa.sa_flags = SA_RESTART; |
| 56 | sigaction(SIGALRM, &sa, NULL); |
| 57 | |
| 58 | v.it_interval.tv_sec = 1; |
| 59 | v.it_interval.tv_usec = 0; |
| 60 | v.it_value = v.it_interval; |
| 61 | setitimer(ITIMER_REAL, &v, NULL); |
| 62 | } |
| 63 | |
| 64 | static void clear_progress_signal(void) |
| 65 | { |
| 66 | struct itimerval v = {{0,},}; |
| 67 | setitimer(ITIMER_REAL, &v, NULL); |
| 68 | signal(SIGALRM, SIG_IGN); |
| 69 | progress_update = 0; |
| 70 | } |
| 71 | |
Nicolas Pitre | a984a06 | 2007-11-08 15:45:41 -0500 | [diff] [blame] | 72 | static int display(struct progress *progress, unsigned n, const char *done) |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 73 | { |
Nicolas Pitre | a984a06 | 2007-11-08 15:45:41 -0500 | [diff] [blame] | 74 | const char *eol, *tp; |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 75 | |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 76 | if (progress->delay) { |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 77 | if (!progress_update || --progress->delay) |
| 78 | return 0; |
| 79 | if (progress->total) { |
| 80 | unsigned percent = n * 100 / progress->total; |
| 81 | if (percent > progress->delayed_percent_treshold) { |
| 82 | /* inhibit this progress report entirely */ |
| 83 | clear_progress_signal(); |
| 84 | progress->delay = -1; |
| 85 | progress->total = 0; |
| 86 | return 0; |
| 87 | } |
| 88 | } |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 89 | } |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 90 | |
| 91 | progress->last_value = n; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 92 | tp = (progress->throughput) ? progress->throughput->display : ""; |
Nicolas Pitre | a984a06 | 2007-11-08 15:45:41 -0500 | [diff] [blame] | 93 | eol = done ? done : " \r"; |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 94 | if (progress->total) { |
| 95 | unsigned percent = n * 100 / progress->total; |
| 96 | if (percent != progress->last_percent || progress_update) { |
| 97 | progress->last_percent = percent; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 98 | fprintf(stderr, "%s: %3u%% (%u/%u)%s%s", |
| 99 | progress->title, percent, n, |
| 100 | progress->total, tp, eol); |
Johannes Sixt | 137a0d0 | 2007-11-19 20:48:58 +0100 | [diff] [blame] | 101 | fflush(stderr); |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 102 | progress_update = 0; |
| 103 | return 1; |
| 104 | } |
| 105 | } else if (progress_update) { |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 106 | fprintf(stderr, "%s: %u%s%s", progress->title, n, tp, eol); |
Johannes Sixt | 137a0d0 | 2007-11-19 20:48:58 +0100 | [diff] [blame] | 107 | fflush(stderr); |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 108 | progress_update = 0; |
| 109 | return 1; |
| 110 | } |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 111 | |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 112 | return 0; |
| 113 | } |
| 114 | |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 115 | static void throughput_string(struct throughput *tp, off_t total, |
| 116 | unsigned int rate) |
| 117 | { |
| 118 | int l = sizeof(tp->display); |
| 119 | if (total > 1 << 30) { |
| 120 | l -= snprintf(tp->display, l, ", %u.%2.2u GiB", |
| 121 | (int)(total >> 30), |
| 122 | (int)(total & ((1 << 30) - 1)) / 10737419); |
| 123 | } else if (total > 1 << 20) { |
| 124 | l -= snprintf(tp->display, l, ", %u.%2.2u MiB", |
| 125 | (int)(total >> 20), |
| 126 | ((int)(total & ((1 << 20) - 1)) * 100) >> 20); |
| 127 | } else if (total > 1 << 10) { |
| 128 | l -= snprintf(tp->display, l, ", %u.%2.2u KiB", |
| 129 | (int)(total >> 10), |
| 130 | ((int)(total & ((1 << 10) - 1)) * 100) >> 10); |
| 131 | } else { |
| 132 | l -= snprintf(tp->display, l, ", %u bytes", (int)total); |
| 133 | } |
| 134 | if (rate) |
| 135 | snprintf(tp->display + sizeof(tp->display) - l, l, |
| 136 | " | %u KiB/s", rate); |
| 137 | } |
| 138 | |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 139 | void display_throughput(struct progress *progress, off_t total) |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 140 | { |
| 141 | struct throughput *tp; |
| 142 | struct timeval tv; |
| 143 | unsigned int misecs; |
| 144 | |
| 145 | if (!progress) |
| 146 | return; |
| 147 | tp = progress->throughput; |
| 148 | |
| 149 | gettimeofday(&tv, NULL); |
| 150 | |
| 151 | if (!tp) { |
| 152 | progress->throughput = tp = calloc(1, sizeof(*tp)); |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 153 | if (tp) { |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 154 | tp->prev_total = tp->curr_total = total; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 155 | tp->prev_tv = tv; |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 156 | } |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 157 | return; |
| 158 | } |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 159 | tp->curr_total = total; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 160 | |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 161 | /* |
| 162 | * We have x = bytes and y = microsecs. We want z = KiB/s: |
| 163 | * |
| 164 | * z = (x / 1024) / (y / 1000000) |
| 165 | * z = x / y * 1000000 / 1024 |
| 166 | * z = x / (y * 1024 / 1000000) |
| 167 | * z = x / y' |
| 168 | * |
| 169 | * To simplify things we'll keep track of misecs, or 1024th of a sec |
| 170 | * obtained with: |
| 171 | * |
| 172 | * y' = y * 1024 / 1000000 |
| 173 | * y' = y / (1000000 / 1024) |
| 174 | * y' = y / 977 |
| 175 | */ |
| 176 | misecs = (tv.tv_sec - tp->prev_tv.tv_sec) * 1024; |
| 177 | misecs += (int)(tv.tv_usec - tp->prev_tv.tv_usec) / 977; |
| 178 | |
| 179 | if (misecs > 512) { |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 180 | unsigned int count, rate; |
| 181 | |
| 182 | count = total - tp->prev_total; |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 183 | tp->prev_total = total; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 184 | tp->prev_tv = tv; |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 185 | tp->avg_bytes += count; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 186 | tp->avg_misecs += misecs; |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 187 | rate = tp->avg_bytes / tp->avg_misecs; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 188 | tp->avg_bytes -= tp->last_bytes[tp->idx]; |
| 189 | tp->avg_misecs -= tp->last_misecs[tp->idx]; |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 190 | tp->last_bytes[tp->idx] = count; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 191 | tp->last_misecs[tp->idx] = misecs; |
| 192 | tp->idx = (tp->idx + 1) % TP_IDX_MAX; |
Nicolas Pitre | 3e935d1 | 2007-11-01 16:59:56 -0400 | [diff] [blame] | 193 | |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 194 | throughput_string(tp, total, rate); |
Nicolas Pitre | 3e935d1 | 2007-11-01 16:59:56 -0400 | [diff] [blame] | 195 | if (progress->last_value != -1 && progress_update) |
Nicolas Pitre | a984a06 | 2007-11-08 15:45:41 -0500 | [diff] [blame] | 196 | display(progress, progress->last_value, NULL); |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 197 | } |
| 198 | } |
| 199 | |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 200 | int display_progress(struct progress *progress, unsigned n) |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 201 | { |
Nicolas Pitre | a984a06 | 2007-11-08 15:45:41 -0500 | [diff] [blame] | 202 | return progress ? display(progress, n, NULL) : 0; |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 203 | } |
| 204 | |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 205 | struct progress *start_progress_delay(const char *title, unsigned total, |
| 206 | unsigned percent_treshold, unsigned delay) |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 207 | { |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 208 | struct progress *progress = malloc(sizeof(*progress)); |
| 209 | if (!progress) { |
| 210 | /* unlikely, but here's a good fallback */ |
| 211 | fprintf(stderr, "%s...\n", title); |
Johannes Sixt | 137a0d0 | 2007-11-19 20:48:58 +0100 | [diff] [blame] | 212 | fflush(stderr); |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 213 | return NULL; |
| 214 | } |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 215 | progress->title = title; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 216 | progress->total = total; |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 217 | progress->last_value = -1; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 218 | progress->last_percent = -1; |
| 219 | progress->delayed_percent_treshold = percent_treshold; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 220 | progress->delay = delay; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 221 | progress->throughput = NULL; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 222 | set_progress_signal(); |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 223 | return progress; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 224 | } |
| 225 | |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 226 | struct progress *start_progress(const char *title, unsigned total) |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 227 | { |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 228 | return start_progress_delay(title, total, 0, 0); |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 229 | } |
| 230 | |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 231 | void stop_progress(struct progress **p_progress) |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 232 | { |
Nicolas Pitre | a984a06 | 2007-11-08 15:45:41 -0500 | [diff] [blame] | 233 | stop_progress_msg(p_progress, "done"); |
| 234 | } |
| 235 | |
| 236 | void stop_progress_msg(struct progress **p_progress, const char *msg) |
| 237 | { |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 238 | struct progress *progress = *p_progress; |
| 239 | if (!progress) |
| 240 | return; |
| 241 | *p_progress = NULL; |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 242 | if (progress->last_value != -1) { |
| 243 | /* Force the last update */ |
Boyd Lynn Gerber | d4c4444 | 2008-06-08 09:26:15 -0600 | [diff] [blame] | 244 | char buf[128], *bufp; |
| 245 | size_t len = strlen(msg) + 5; |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 246 | struct throughput *tp = progress->throughput; |
Boyd Lynn Gerber | d4c4444 | 2008-06-08 09:26:15 -0600 | [diff] [blame] | 247 | |
| 248 | bufp = (len < sizeof(buf)) ? buf : xmalloc(len + 1); |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 249 | if (tp) { |
| 250 | unsigned int rate = !tp->avg_misecs ? 0 : |
| 251 | tp->avg_bytes / tp->avg_misecs; |
| 252 | throughput_string(tp, tp->curr_total, rate); |
| 253 | } |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 254 | progress_update = 1; |
Boyd Lynn Gerber | d4c4444 | 2008-06-08 09:26:15 -0600 | [diff] [blame] | 255 | sprintf(bufp, ", %s.\n", msg); |
| 256 | display(progress, progress->last_value, bufp); |
| 257 | if (buf != bufp) |
| 258 | free(bufp); |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 259 | } |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 260 | clear_progress_signal(); |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 261 | free(progress->throughput); |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 262 | free(progress); |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 263 | } |