Among the flaky tests, it seems that the Azure Pipeline suffers relatively frequently from t5516 failing with the Visual Studio builds. Essentially, we grep for an error message, but that error message is produced twice, once by a fetch and once by the upload-pack spawned from it, and those error messages are usually interleaved because of MSVC runtime fprintf() idiosyncracies. The commit message of this patch is based, in part, on https://github.com/gitgitgadget/git/pull/407. The patch itself is a much more minimal alternative (using xwrite() instead of fprintf()) to the code of https://github.com/gitgitgadget/git/pull/407, avoiding the complexity of the part of the code that allows for unlimited messages. While it would seem theoretically more elegant to allow for unlimited messages, in practice too-long messages cause more problems than they solve, and therefore we already clip them, and this patch does not change that behavior. This fixes https://github.com/gitgitgadget/git/issues/240. Changes since v1: * Changed the oneline to be more accurate (thanks Junio). * Improved the commit message (e.g. talking about the xwrite() function this patch uses, rather than the write_in_full() function used by an earlier iteration, thanks Gábor). * Revamped the actual code to account for insanely long prefixes (thanks for the advice, Junio). Johannes Schindelin (1): vreportf(): avoid relying on stdio buffering usage.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) base-commit: 566a1439f6f56c2171b8853ddbca0ad3f5098770 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-428%2Fdscho%2Ffix-t5516-flakiness-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-428/dscho/fix-t5516-flakiness-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/428 Range-diff vs v1: 1: 455026ce3e ! 1: e426627e14 vreportf(): avoid buffered write in favor of unbuffered one @@ -1,6 +1,6 @@ Author: Johannes Schindelin <johannes.schindelin@xxxxxx> - vreportf(): avoid buffered write in favor of unbuffered one + vreportf(): avoid relying on stdio buffering The MSVC runtime behavior differs from glibc's with respect to `fprintf(stderr, ...)` in that the former writes out the message @@ -16,7 +16,9 @@ Let's avoid this predicament altogether by rendering the entire message, including the prefix and the trailing newline, into the buffer we already have (and which is still fixed size) and then write it out via - `write_in_full()`. + `xwrite()`. + + We still clip the message to at most 4095 characters. The history of `vreportf()` with regard to this issue includes the following commits: @@ -36,39 +38,45 @@ so it's safe to use xwrite() again 5e5be9e2 (2016-06-28) - recv_sideband() uses xwrite() again - Note that we need to be careful to handle the return value of - `vsnprintf()` that indicates the _desired_ byte count. + Note that we print nothing if the `vsnprintf()` call failed to render + the error message; There is little we can do in that case, and it should + not happen anyway. Also please note that we `fflush(stderr)` here to help when running in a Git Bash on Windows: in this case, `stderr` is not actually truly unbuffered, and needs the extra help. - Co-authored-by: Alexandr Miloslavskiy <alexandr.miloslavskiy@xxxxxxxxxxx> + Helped-by: Alexandr Miloslavskiy <alexandr.miloslavskiy@xxxxxxxxxxx> + Helped-by: SZEDER Gábor <szeder.dev@xxxxxxxxx> + Helped-by: Junio C Hamano <gitster@xxxxxxxxx> Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> diff --git a/usage.c b/usage.c --- a/usage.c +++ b/usage.c @@ + void vreportf(const char *prefix, const char *err, va_list params) { char msg[4096]; - char *p; -- -- vsnprintf(msg, sizeof(msg), err, params); +- char *p; + size_t off = strlcpy(msg, prefix, sizeof(msg)); -+ int ret = vsnprintf(msg + off, sizeof(msg) - off, err, params); - for (p = msg; *p; p++) { ++ char *p, *pend = msg + sizeof(msg); + +- vsnprintf(msg, sizeof(msg), err, params); +- for (p = msg; *p; p++) { ++ p = msg + off < pend ? msg + off : pend - 1; ++ if (vsnprintf(p, pend - p, err, params) < 0) ++ return; /* vsnprintf() failed, there is nothing we can do */ ++ ++ for (; p != pend - 1 && *p; p++) { if (iscntrl(*p) && *p != '\t' && *p != '\n') *p = '?'; } - fprintf(stderr, "%s%s\n", prefix, msg); -+ if (ret > 0) { -+ if (off + ret > sizeof(msg) - 1) -+ ret = sizeof(msg) - 1 - off; -+ msg[off + ret] = '\n'; /* we no longer need a NUL */ -+ fflush(stderr); -+ xwrite(2, msg, off + ret + 1); -+ } ++ ++ *(p++) = '\n'; /* we no longer need a NUL */ ++ fflush(stderr); ++ xwrite(2, msg, p - msg); } static NORETURN void usage_builtin(const char *err, va_list params) -- gitgitgadget
