From: "René Scharfe" <l.s.r@web.de>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v2] pipe_command(): mark stdin descriptor as non-blocking
Date: Wed, 3 Aug 2022 23:56:13 +0200 [thread overview]
Message-ID: <41477326-5493-4d3c-246d-8a28969fa73e@web.de> (raw)
In-Reply-To: <YuquVEqEl6wxCLM7@coredump.intra.peff.net>
Am 03.08.2022 um 19:20 schrieb Jeff King:
> On Wed, Aug 03, 2022 at 06:45:23PM +0200, René Scharfe wrote:
>
>>> +test_expect_success 'handle very large filtered diff' '
>>> + git reset --hard &&
>>> + # The specific number here is not important, but it must
>>> + # be large enough that the output of "git diff --color"
>>> + # fills up the pipe buffer. 10,000 results in ~200k of
>>> + # colored output.
>>> + test_seq 10000 >test &&
>>> + false &&
>>
>> Isn't this test going to end here, reporting failure before it even gets
>> to the interesting part?
>
> Urgh, whoops. That was from some last-minute tweaking of the comment.
> There was also a line:
>
> git diff --color | wc -c
>
> before it so I could measure how big the output was for a few values.
>
> It snuck into the emailed patch, but the actual test runs (including the
> Windows CI) didn't include that (since obviously they'd have failed the
> test).
Without that line the added test hangs for me on the Git for Windows
SDK on Windows 11.
With the patch below it fails and reports basically nothing:
expecting success of 3701.57 'handle very large filtered diff':
git reset --hard &&
# The specific number here is not important, but it must
# be large enough that the output of "git diff --color"
# fills up the pipe buffer. 10,000 results in ~200k of
# colored output.
test_seq 10000 >test &&
test_config interactive.diffFilter cat &&
printf y >y &&
force_color git add -p >output 2>&1 <y &&
git diff-files --exit-code -- test
HEAD is now at 095e8c6 main
not ok 57 - handle very large filtered diff
#
# git reset --hard &&
# # The specific number here is not important, but it must
# # be large enough that the output of "git diff --color"
# # fills up the pipe buffer. 10,000 results in ~200k of
# # colored output.
# test_seq 10000 >test &&
# test_config interactive.diffFilter cat &&
# printf y >y &&
# force_color git add -p >output 2>&1 <y &&
# git diff-files --exit-code -- test
#
1..57
The file "output" contains "error: failed to run 'cat'". This is
add-patch.c::parse_diff() reporting that pipe_command() failed. So
that's not it, yet. (I don't actually know what I'm doing here.)
---
compat/nonblock.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/compat/nonblock.c b/compat/nonblock.c
index 897c099010..030cf92af2 100644
--- a/compat/nonblock.c
+++ b/compat/nonblock.c
@@ -14,8 +14,21 @@ int enable_nonblock(int fd)
#else
+#include "win32.h"
+
int enable_nonblock(int fd)
{
+ DWORD mode;
+ HANDLE handle = winansi_get_osfhandle(fd);
+ if (!handle)
+ return -1;
+ if (!GetNamedPipeHandleState(handle, &mode, NULL, NULL, NULL, NULL, 0))
+ return -1;
+ if (mode & PIPE_NOWAIT)
+ return 0;
+ mode |= PIPE_NOWAIT;
+ if (!SetNamedPipeHandleState(handle, &mode, NULL, NULL))
+ return -1;
return 0;
}
--
2.37.1.windows.1
next prev parent reply other threads:[~2022-08-03 21:56 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-02 4:13 [RFC/PATCH] pipe_command(): mark stdin descriptor as non-blocking Jeff King
2022-08-02 15:04 ` Junio C Hamano
2022-08-02 15:39 ` Jeff King
2022-08-02 16:16 ` Junio C Hamano
2022-08-03 3:53 ` [PATCH v2] " Jeff King
2022-08-03 16:45 ` René Scharfe
2022-08-03 17:20 ` Jeff King
2022-08-03 21:56 ` René Scharfe [this message]
2022-08-05 15:36 ` Jeff King
2022-08-05 21:13 ` René Scharfe
2022-08-07 10:15 ` René Scharfe
2022-08-07 17:41 ` Jeff King
2022-08-10 5:39 ` René Scharfe
2022-08-10 19:53 ` Jeff King
2022-08-10 22:35 ` René Scharfe
2022-08-11 8:52 ` Jeff King
2022-08-10 5:39 ` [PATCH] mingw: handle writes to non-blocking pipe René Scharfe
2022-08-10 9:07 ` Johannes Schindelin
2022-08-10 20:02 ` Jeff King
2022-08-10 22:34 ` René Scharfe
2022-08-11 8:47 ` Jeff King
2022-08-11 17:35 ` René Scharfe
2022-08-11 18:20 ` Jeff King
2022-08-14 15:37 ` René Scharfe
2022-08-17 5:39 ` Jeff King
2022-08-17 6:04 ` [PATCH v2 0/6] fix pipe_command() deadlock Jeff King
2022-08-17 6:04 ` [PATCH v2 1/6] compat: add function to enable nonblocking pipes Jeff King
2022-08-17 20:23 ` Junio C Hamano
2022-08-18 5:41 ` Jeff King
2022-08-17 6:05 ` [PATCH v2 2/6] nonblock: support Windows Jeff King
2022-08-17 6:06 ` [PATCH v2 3/6] git-compat-util: make MAX_IO_SIZE define globally available Jeff King
2022-08-17 6:08 ` [PATCH v2 4/6] pipe_command(): avoid xwrite() for writing to pipe Jeff King
2022-08-17 6:09 ` [PATCH v2 5/6] pipe_command(): handle ENOSPC when writing to a pipe Jeff King
2022-08-17 18:57 ` Junio C Hamano
2022-08-18 5:38 ` Jeff King
2022-08-17 6:10 ` [PATCH v2 6/6] pipe_command(): mark stdin descriptor as non-blocking Jeff King
2022-08-17 6:20 ` [PATCH v2 0/6] fix pipe_command() deadlock Jeff King
2022-08-19 21:19 ` René Scharfe
2022-08-20 7:04 ` Jeff King
2022-08-07 10:14 ` [PATCH v2] pipe_command(): mark stdin descriptor as non-blocking René Scharfe
2022-08-08 12:55 ` Johannes Schindelin
2022-08-08 12:59 ` Johannes Schindelin
2022-08-09 13:04 ` Jeff King
2022-08-09 22:10 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=41477326-5493-4d3c-246d-8a28969fa73e@web.de \
--to=l.s.r@web.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).