development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-30 04:01:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Flush progress message buffer in display().

Browse source 
This will make progress display from pack-objects (invoked via
upload-pack) more responsive on platforms with an implementation
of stdio whose stderr is line buffered.

The standard error stream is defined to be merely "not fully
buffered"; this is different from "unbuffered".  If the
implementation of the stdio library chooses to make it line
buffered, progress reports that end with CR but do not contain
LF will accumulate in the stdio buffer before written out.  A
fflush() after each progress display gives a nice continuous
progress.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Sixt 2007-11-19 20:48:58 +01:00 committed by Junio C Hamano
parent 2439755630
commit 137a0d0ef5
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
progress.c
View file

@ -98,11 +98,13 @@ static int display(struct progress *progress, unsigned n, const char *done)
fprintf(stderr, "%s: %3u%% (%u/%u)%s%s", fprintf(stderr, "%s: %3u%% (%u/%u)%s%s",
progress->title, percent, n, progress->title, percent, n,
progress->total, tp, eol); progress->total, tp, eol);
fflush(stderr);
progress_update = 0; progress_update = 0;
return 1; return 1;
} }
} else if (progress_update) { } else if (progress_update) {
fprintf(stderr, "%s: %u%s%s", progress->title, n, tp, eol); fprintf(stderr, "%s: %u%s%s", progress->title, n, tp, eol);
fflush(stderr);
progress_update = 0; progress_update = 0;
return 1; return 1;
} }
@ -207,6 +209,7 @@ struct progress *start_progress_delay(const char *title, unsigned total,
if (!progress) { if (!progress) {
/* unlikely, but here's a good fallback */ /* unlikely, but here's a good fallback */
fprintf(stderr, "%s...\n", title); fprintf(stderr, "%s...\n", title);
fflush(stderr);
return NULL; return NULL;
} }
progress->title = title; progress->title = title;