Hi Alex, On Tue, 22 Oct 2019, Alexandr Miloslavskiy via GitGitGadget wrote: > From: Alexandr Miloslavskiy <alexandr.miloslavskiy@xxxxxxxxxxx> > > This also fixes t5516 on Windows VS build. Maybe this could do with an example? I could imagine that we might want to use the log of https://dev.azure.com/git/git/_build/results?buildId=1264&view=ms.vss-test-web.build-test-results-tab&runId=1016906&resultId=101011&paneView=attachments: -- snip -- [...] ++ eval ' want_trace && set -x mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" && ( cd "$TRASH_DIRECTORY/prereq-test-dir" && ! git env--helper --type=bool --default=0 --exit-code GIT_TEST_GETTEXT_POISON )' +++ want_trace +++ test t = t +++ test '' = t +++ test t = t +++ set -x +++ mkdir -p '/d/a/1/s/t/trash directory.t5516-fetch-push/prereq-test-dir' +++ cd '/d/a/1/s/t/trash directory.t5516-fetch-push/prereq-test-dir' +++ git env--helper --type=bool --default=0 --exit-code GIT_TEST_GETTEXT_POISON prerequisite C_LOCALE_OUTPUT ok error: 'grep remote error:.*not our ref.*64ea4c133d59fa98e86a771eda009872d6ab2886$ err' didn't find a match in: fatal: git upload-pack: not our ref 64ea4c133d59fa98e86afatal: 771eda009872d6abremote error: upload-pack2: not our re886 f 64ea4c133d59fa98e86a771eda009872d6ab2886 error: last command exited with $?=1 -- snap -- It is quite obvious that this `fatal:` line is garbled ;-) > For detailed explanation please refer to code comments in this commit. > > There was a lot of back-and-forth already in vreportf(): > d048a96e (2007-11-09) - 'char msg[256]' is introduced to avoid interleaving > 389d1767 (2009-03-25) - Buffer size increased to 1024 to avoid truncation > 625a860c (2009-11-22) - Buffer size increased to 4096 to avoid truncation > f4c3edc0 (2015-08-11) - Buffer removed to avoid truncation > b5a9e435 (2017-01-11) - Reverts f4c3edc0 to be able to replace control > chars before sending to stderr > > This fix attempts to solve all issues: > 1) avoid multiple fprintf() interleaving > 2) avoid truncation > 3) avoid char interleaving in fprintf() on some platforms > 4) avoid buffer block interleaving when output is large > 5) avoid out-of-order messages > 6) replace control characters in output > > Other commits worthy of notice: > 9ac13ec9 (2006-10-11) - Another attempt to solve interleaving. > This is seemingly related to d048a96e. > 137a0d0e (2007-11-19) - Addresses out-of-order for display() > 34df8aba (2009-03-10) - Switches xwrite() to fprintf() in recv_sideband() > to support UTF-8 emulation > eac14f89 (2012-01-14) - Removes the need for fprintf() for UTF-8 emulation, > so it's safe to use xwrite() again > 5e5be9e2 (2016-06-28) - recv_sideband() uses xwrite() again So far, it makes a lot of sense, and is well-researched. Thank you for being very diligent. > > Signed-off-by: Alexandr Miloslavskiy <alexandr.miloslavskiy@xxxxxxxxxxx> > --- > usage.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 148 insertions(+), 6 deletions(-) > > diff --git a/usage.c b/usage.c > index 2fdb20086b..ccdd91a7b9 100644 > --- a/usage.c > +++ b/usage.c > @@ -6,17 +6,159 @@ > #include "git-compat-util.h" > #include "cache.h" > > +static void replace_control_chars(char* str, size_t size, char replacement) > +{ > + size_t i; > + > + for (i = 0; i < size; i++) { > + if (iscntrl(str[i]) && str[i] != '\t' && str[i] != '\n') > + str[i] = replacement; > + } > +} So this is just factored out from `vreportf()`, right? > + > +/* > + * Atomically report (prefix + vsnprintf(err, params) + '\n') to stderr. > + * Always returns desired buffer size. > + * Doesn't write to stderr if content didn't fit. > + * > + * This function composes everything into a single buffer before > + * sending to stderr. This is to defeat various non-atomic issues: > + * 1) If stderr is fully buffered: > + * the ordering of stdout and stderr messages could be wrong, > + * because stderr output waits for the buffer to become full. > + * 2) If stderr has any type of buffering: > + * buffer has fixed size, which could lead to interleaved buffer > + * blocks when two threads/processes write at the same time. > + * 3) If stderr is not buffered: > + * There are two problems, one with atomic fprintf() and another > + * for non-atomic fprintf(), and both occur depending on platform > + * (see details below). If atomic, this function still writes 3 > + * parts, which could get interleaved with multiple threads. If > + * not atomic, then fprintf() will basically write char-by-char, > + * which leads to unreadable char-interleaved writes if two > + * processes write to stderr at the same time (threads are OK > + * because fprintf() usually locks file in current process). This > + * for example happens in t5516 where 'git-upload-pack' detects > + * an error, reports it to parent 'git fetch' and both die() at the > + * same time. > + * > + * Behaviors, at the moment of writing: > + * a) libc - fprintf()-interleaved > + * fprintf() enables temporary stream buffering. > + * See: buffered_vfprintf() > + * b) VC++ - char-interleaved > + * fprintf() enables temporary stream buffering, but only if > + * stream was not set to no buffering. This has no effect, > + * because stderr is not buffered by default, and git takes > + * an extra step to ensure that in swap_osfhnd(). > + * See: _iob[_IOB_ENTRIES], > + * __acrt_stdio_temporary_buffering_guard, > + * has_any_buffer() > + * c) MinGW - char-interleaved (console), full buffering (file) > + * fprintf() obeys stderr buffering. But it uses old MSVCRT.DLL, > + * which eventually calls _flsbuf(), which enables buffering unless > + * isatty(stderr) or buffering is disabled. Buffering is not disabled > + * by default for stderr. Therefore, buffering is enabled for > + * file-redirected stderr. > + * See: __mingw_vfprintf(), > + * __pformat_wcputs(), > + * _fputc_nolock(), > + * _flsbuf(), > + * _iob[_IOB_ENTRIES] > + * 4) If stderr is line buffered: MinGW/VC++ will enable full > + * buffering instead. See MSDN setvbuf(). > + */ > +static size_t vreportf_buf(char *buf, size_t buf_size, const char *prefix, const char *err, va_list params) > +{ > + int printf_ret = 0; > + size_t prefix_size = 0; > + size_t total_size = 0; > + > + /* > + * NOTE: Can't use strbuf functions here, because it can be called when > + * malloc() is no longer possible, and strbuf will recurse die(). > + */ > + > + /* Prefix */ > + prefix_size = strlen(prefix); > + if (total_size + prefix_size <= buf_size) > + memcpy(buf + total_size, prefix, prefix_size); > + > + total_size += prefix_size; > + > + /* Formatted message */ > + if (total_size <= buf_size) > + printf_ret = vsnprintf(buf + total_size, buf_size - total_size, err, params); > + else > + printf_ret = vsnprintf(NULL, 0, err, params); > + > + if (printf_ret < 0) > + BUG("your vsnprintf is broken (returned %d)", printf_ret); > + > + /* > + * vsnprintf() returns _desired_ size (without terminating null). > + * If vsnprintf() was truncated that will be seen when appending '\n'. > + */ > + total_size += printf_ret; > + > + /* Trailing \n */ > + if (total_size + 1 <= buf_size) > + buf[total_size] = '\n'; > + > + total_size += 1; > + > + /* Send the buffer, if content fits */ > + if (total_size <= buf_size) { > + replace_control_chars(buf, total_size, '?'); > + fwrite(buf, total_size, 1, stderr); > + } > + > + return total_size; > +} > + > void vreportf(const char *prefix, const char *err, va_list params) > { > + size_t res = 0; > + char *buf = NULL; > + size_t buf_size = 0; > + > + /* > + * NOTE: This can be called from failed xmalloc(). Any malloc() can > + * fail now. Let's try to report with a fixed size stack based buffer. > + * Also, most messages should fit, and this path is faster. > + */ > char msg[4096]; > - char *p; > + res = vreportf_buf(msg, sizeof(msg), prefix, err, params); > + if (res <= sizeof(msg)) { > + /* Success */ > + return; > + } > > - vsnprintf(msg, sizeof(msg), err, params); > - for (p = msg; *p; p++) { > - if (iscntrl(*p) && *p != '\t' && *p != '\n') > - *p = '?'; > + /* > + * Try to allocate a suitable sized malloc(), if possible. > + * NOTE: Do not use xmalloc(), because on failure it will call > + * die() or warning() and lead to recursion. > + */ > + buf_size = res; > + buf = malloc(buf_size); Why not `alloca()`? And to take a step back, I think that previous rounds of patches trying to essentially address the same problem made the case that it is okay to cut off insanely-long messages, so I am not sure we would want to open that can of worms again... > + if (buf) { > + res = vreportf_buf(buf, buf_size, prefix, err, params); > + FREE_AND_NULL(buf); > + > + if (res <= buf_size) { > + /* Success */ > + return; > + } > } > - fprintf(stderr, "%s%s\n", prefix, msg); > + > + /* > + * When everything fails, report in parts. > + * This can have all problems prevented by vreportf_buf(). > + */ > + fprintf(stderr, "vreportf: not enough memory (tried to allocate %lu bytes)\n", (unsigned long)buf_size); > + fputs(prefix, stderr); > + vfprintf(stderr, err, params); > + fputc('\n', stderr); Quite honestly, I would love to avoid that amount of complexity, certainly in a part of the code that we would like to have rock solid because it is usually exercised when things go very, very wrong and we need to provide the user who is bitten by it enough information to take to the Git contributors to figure out the root cause(s). So let's take another step back and look at the original `vreportf()`: void vreportf(const char *prefix, const char *err, va_list params) { char msg[4096]; char *p; vsnprintf(msg, sizeof(msg), err, params); for (p = msg; *p; p++) { if (iscntrl(*p) && *p != '\t' && *p != '\n') *p = '?'; } fprintf(stderr, "%s%s\n", prefix, msg); } Is the problem that causes those failures with VS the fact that `fprintf(stderr, ...)` might be interleaved with the output of another process that _also_ wants to write to `stderr`? I assume that this _is_ the problem. Further, I guess that the problem is compounded by the fact that we usually run the tests in a Git Bash on Windows, i.e. in a MinTTY that emulates a console (there _is_ work under way to support the newly introduces ptys, but that work is far from done), so the standard error file handle might behave in unexpected ways in that scenario. But I do wonder whether replacing that `fprintf()` by a `write()` would work better. After all, we could write the `prefix` into the `msg` already: size_t off = strlcpy(msg, prefix, sizeof(msg)); int ret = vsnprintf(msg + off, sizeof(msg) - off, err, params); [...] if (ret > 0) write(2, msg, off + ret); Would that also work around the problem? Ciao, Dscho > } > > static NORETURN void usage_builtin(const char *err, va_list params) > -- > gitgitgadget >
