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 | |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 11 | #include "git-compat-util.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" |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 16 | |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 17 | #define TP_IDX_MAX 8 |
| 18 | |
| 19 | struct throughput { |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 20 | off_t curr_total; |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 21 | off_t prev_total; |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 22 | uint64_t prev_ns; |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 23 | unsigned int avg_bytes; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 24 | unsigned int avg_misecs; |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 25 | unsigned int last_bytes[TP_IDX_MAX]; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 26 | unsigned int last_misecs[TP_IDX_MAX]; |
| 27 | unsigned int idx; |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 28 | struct strbuf display; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 29 | }; |
| 30 | |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 31 | struct progress { |
| 32 | const char *title; |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 33 | uint64_t last_value; |
| 34 | uint64_t total; |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 35 | unsigned last_percent; |
| 36 | unsigned delay; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 37 | struct throughput *throughput; |
René Scharfe | 0fae1e0 | 2017-07-08 18:43:42 +0200 | [diff] [blame] | 38 | uint64_t start_ns; |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 39 | }; |
| 40 | |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 41 | static volatile sig_atomic_t progress_update; |
| 42 | |
| 43 | static void progress_interval(int signum) |
| 44 | { |
| 45 | progress_update = 1; |
| 46 | } |
| 47 | |
| 48 | static void set_progress_signal(void) |
| 49 | { |
| 50 | struct sigaction sa; |
| 51 | struct itimerval v; |
| 52 | |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 53 | progress_update = 0; |
| 54 | |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 55 | memset(&sa, 0, sizeof(sa)); |
| 56 | sa.sa_handler = progress_interval; |
| 57 | sigemptyset(&sa.sa_mask); |
| 58 | sa.sa_flags = SA_RESTART; |
| 59 | sigaction(SIGALRM, &sa, NULL); |
| 60 | |
| 61 | v.it_interval.tv_sec = 1; |
| 62 | v.it_interval.tv_usec = 0; |
| 63 | v.it_value = v.it_interval; |
| 64 | setitimer(ITIMER_REAL, &v, NULL); |
| 65 | } |
| 66 | |
| 67 | static void clear_progress_signal(void) |
| 68 | { |
| 69 | struct itimerval v = {{0,},}; |
| 70 | setitimer(ITIMER_REAL, &v, NULL); |
| 71 | signal(SIGALRM, SIG_IGN); |
| 72 | progress_update = 0; |
| 73 | } |
| 74 | |
Luke Mewburn | 85cb890 | 2015-04-13 23:30:51 +1000 | [diff] [blame] | 75 | static int is_foreground_fd(int fd) |
| 76 | { |
Jeff King | a4fb76c | 2015-05-19 01:24:57 -0400 | [diff] [blame] | 77 | int tpgrp = tcgetpgrp(fd); |
| 78 | return tpgrp < 0 || tpgrp == getpgid(0); |
Luke Mewburn | 85cb890 | 2015-04-13 23:30:51 +1000 | [diff] [blame] | 79 | } |
| 80 | |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 81 | static int display(struct progress *progress, uint64_t n, const char *done) |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 82 | { |
Nicolas Pitre | a984a06 | 2007-11-08 15:45:41 -0500 | [diff] [blame] | 83 | const char *eol, *tp; |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 84 | |
Lars Schneider | 9c5951c | 2017-12-04 17:07:00 -0500 | [diff] [blame] | 85 | if (progress->delay && (!progress_update || --progress->delay)) |
| 86 | return 0; |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 87 | |
| 88 | progress->last_value = n; |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 89 | tp = (progress->throughput) ? progress->throughput->display.buf : ""; |
Nicolas Pitre | a984a06 | 2007-11-08 15:45:41 -0500 | [diff] [blame] | 90 | eol = done ? done : " \r"; |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 91 | if (progress->total) { |
| 92 | unsigned percent = n * 100 / progress->total; |
| 93 | if (percent != progress->last_percent || progress_update) { |
| 94 | progress->last_percent = percent; |
Luke Mewburn | 85cb890 | 2015-04-13 23:30:51 +1000 | [diff] [blame] | 95 | if (is_foreground_fd(fileno(stderr)) || done) { |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 96 | fprintf(stderr, "%s: %3u%% (%"PRIuMAX"/%"PRIuMAX")%s%s", |
| 97 | progress->title, percent, |
| 98 | (uintmax_t)n, (uintmax_t)progress->total, |
| 99 | tp, eol); |
Luke Mewburn | 85cb890 | 2015-04-13 23:30:51 +1000 | [diff] [blame] | 100 | fflush(stderr); |
| 101 | } |
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) { |
Luke Mewburn | 85cb890 | 2015-04-13 23:30:51 +1000 | [diff] [blame] | 106 | if (is_foreground_fd(fileno(stderr)) || done) { |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 107 | fprintf(stderr, "%s: %"PRIuMAX"%s%s", |
| 108 | progress->title, (uintmax_t)n, tp, eol); |
Luke Mewburn | 85cb890 | 2015-04-13 23:30:51 +1000 | [diff] [blame] | 109 | fflush(stderr); |
| 110 | } |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 111 | progress_update = 0; |
| 112 | return 1; |
| 113 | } |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 114 | |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 115 | return 0; |
| 116 | } |
| 117 | |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 118 | static void throughput_string(struct strbuf *buf, uint64_t total, |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 119 | unsigned int rate) |
| 120 | { |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 121 | strbuf_reset(buf); |
Antoine Pelisse | 079b546 | 2013-04-10 21:03:23 +0200 | [diff] [blame] | 122 | strbuf_addstr(buf, ", "); |
| 123 | strbuf_humanise_bytes(buf, total); |
| 124 | strbuf_addstr(buf, " | "); |
| 125 | strbuf_humanise_bytes(buf, rate * 1024); |
| 126 | strbuf_addstr(buf, "/s"); |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 127 | } |
| 128 | |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 129 | void display_throughput(struct progress *progress, uint64_t total) |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 130 | { |
| 131 | struct throughput *tp; |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 132 | uint64_t now_ns; |
| 133 | unsigned int misecs, count, rate; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 134 | |
| 135 | if (!progress) |
| 136 | return; |
| 137 | tp = progress->throughput; |
| 138 | |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 139 | now_ns = getnanotime(); |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 140 | |
| 141 | if (!tp) { |
| 142 | progress->throughput = tp = calloc(1, sizeof(*tp)); |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 143 | if (tp) { |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 144 | tp->prev_total = tp->curr_total = total; |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 145 | tp->prev_ns = now_ns; |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 146 | strbuf_init(&tp->display, 0); |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 147 | } |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 148 | return; |
| 149 | } |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 150 | tp->curr_total = total; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 151 | |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 152 | /* only update throughput every 0.5 s */ |
| 153 | if (now_ns - tp->prev_ns <= 500000000) |
| 154 | return; |
| 155 | |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 156 | /* |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 157 | * We have x = bytes and y = nanosecs. We want z = KiB/s: |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 158 | * |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 159 | * z = (x / 1024) / (y / 1000000000) |
| 160 | * z = x / y * 1000000000 / 1024 |
| 161 | * z = x / (y * 1024 / 1000000000) |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 162 | * z = x / y' |
| 163 | * |
| 164 | * To simplify things we'll keep track of misecs, or 1024th of a sec |
| 165 | * obtained with: |
| 166 | * |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 167 | * y' = y * 1024 / 1000000000 |
| 168 | * y' = y * (2^10 / 2^42) * (2^42 / 1000000000) |
| 169 | * y' = y / 2^32 * 4398 |
| 170 | * y' = (y * 4398) >> 32 |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 171 | */ |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 172 | misecs = ((now_ns - tp->prev_ns) * 4398) >> 32; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 173 | |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 174 | count = total - tp->prev_total; |
| 175 | tp->prev_total = total; |
| 176 | tp->prev_ns = now_ns; |
| 177 | tp->avg_bytes += count; |
| 178 | tp->avg_misecs += misecs; |
| 179 | rate = tp->avg_bytes / tp->avg_misecs; |
| 180 | tp->avg_bytes -= tp->last_bytes[tp->idx]; |
| 181 | tp->avg_misecs -= tp->last_misecs[tp->idx]; |
| 182 | tp->last_bytes[tp->idx] = count; |
| 183 | tp->last_misecs[tp->idx] = misecs; |
| 184 | tp->idx = (tp->idx + 1) % TP_IDX_MAX; |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 185 | |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 186 | throughput_string(&tp->display, total, rate); |
Karsten Blees | 83d26fa | 2014-07-12 02:08:11 +0200 | [diff] [blame] | 187 | if (progress->last_value != -1 && progress_update) |
| 188 | display(progress, progress->last_value, NULL); |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 189 | } |
| 190 | |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 191 | int display_progress(struct progress *progress, uint64_t n) |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 192 | { |
Nicolas Pitre | a984a06 | 2007-11-08 15:45:41 -0500 | [diff] [blame] | 193 | return progress ? display(progress, n, NULL) : 0; |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 194 | } |
| 195 | |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 196 | static struct progress *start_progress_delay(const char *title, uint64_t total, |
Lars Schneider | 9c5951c | 2017-12-04 17:07:00 -0500 | [diff] [blame] | 197 | unsigned delay) |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 198 | { |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 199 | struct progress *progress = malloc(sizeof(*progress)); |
| 200 | if (!progress) { |
| 201 | /* unlikely, but here's a good fallback */ |
| 202 | fprintf(stderr, "%s...\n", title); |
Johannes Sixt | 137a0d0 | 2007-11-19 20:48:58 +0100 | [diff] [blame] | 203 | fflush(stderr); |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 204 | return NULL; |
| 205 | } |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 206 | progress->title = title; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 207 | progress->total = total; |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 208 | progress->last_value = -1; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 209 | progress->last_percent = -1; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 210 | progress->delay = delay; |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 211 | progress->throughput = NULL; |
René Scharfe | 0fae1e0 | 2017-07-08 18:43:42 +0200 | [diff] [blame] | 212 | progress->start_ns = getnanotime(); |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 213 | set_progress_signal(); |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 214 | return progress; |
Nicolas Pitre | 180a9f2 | 2007-04-20 15:05:27 -0400 | [diff] [blame] | 215 | } |
| 216 | |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 217 | struct progress *start_delayed_progress(const char *title, uint64_t total) |
Junio C Hamano | 8aade10 | 2017-08-19 10:39:41 -0700 | [diff] [blame] | 218 | { |
Lars Schneider | 9c5951c | 2017-12-04 17:07:00 -0500 | [diff] [blame] | 219 | return start_progress_delay(title, total, 2); |
Junio C Hamano | 8aade10 | 2017-08-19 10:39:41 -0700 | [diff] [blame] | 220 | } |
| 221 | |
Elijah Newren | d6861d0 | 2017-11-13 12:15:58 -0800 | [diff] [blame] | 222 | struct progress *start_progress(const char *title, uint64_t total) |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 223 | { |
Lars Schneider | 9c5951c | 2017-12-04 17:07:00 -0500 | [diff] [blame] | 224 | return start_progress_delay(title, total, 0); |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 225 | } |
| 226 | |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 227 | void stop_progress(struct progress **p_progress) |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 228 | { |
Nguyễn Thái Ngọc Duy | 754dbc4 | 2014-02-21 19:50:18 +0700 | [diff] [blame] | 229 | stop_progress_msg(p_progress, _("done")); |
Nicolas Pitre | a984a06 | 2007-11-08 15:45:41 -0500 | [diff] [blame] | 230 | } |
| 231 | |
| 232 | void stop_progress_msg(struct progress **p_progress, const char *msg) |
| 233 | { |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 234 | struct progress *progress = *p_progress; |
| 235 | if (!progress) |
| 236 | return; |
| 237 | *p_progress = NULL; |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 238 | if (progress->last_value != -1) { |
| 239 | /* Force the last update */ |
Maxim Moseychuk | fbd0943 | 2017-02-16 20:07:13 +0300 | [diff] [blame] | 240 | char *buf; |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 241 | struct throughput *tp = progress->throughput; |
Boyd Lynn Gerber | d4c4444 | 2008-06-08 09:26:15 -0600 | [diff] [blame] | 242 | |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 243 | if (tp) { |
René Scharfe | 0fae1e0 | 2017-07-08 18:43:42 +0200 | [diff] [blame] | 244 | uint64_t now_ns = getnanotime(); |
| 245 | unsigned int misecs, rate; |
| 246 | misecs = ((now_ns - progress->start_ns) * 4398) >> 32; |
| 247 | rate = tp->curr_total / (misecs ? misecs : 1); |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 248 | throughput_string(&tp->display, tp->curr_total, rate); |
Nicolas Pitre | 53ed7b5 | 2007-11-06 16:30:28 -0500 | [diff] [blame] | 249 | } |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 250 | progress_update = 1; |
Maxim Moseychuk | fbd0943 | 2017-02-16 20:07:13 +0300 | [diff] [blame] | 251 | buf = xstrfmt(", %s.\n", msg); |
| 252 | display(progress, progress->last_value, buf); |
| 253 | free(buf); |
Nicolas Pitre | 42e18fb | 2007-10-16 21:55:45 -0400 | [diff] [blame] | 254 | } |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 255 | clear_progress_signal(); |
Jeff King | 3131977 | 2015-09-24 17:05:57 -0400 | [diff] [blame] | 256 | if (progress->throughput) |
| 257 | strbuf_release(&progress->throughput->display); |
Nicolas Pitre | cf84d51 | 2007-10-30 14:57:34 -0400 | [diff] [blame] | 258 | free(progress->throughput); |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 259 | free(progress); |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 260 | } |