From: Junio C Hamano <gitster@pobox•com>
To: "Carlo Marcelo Arenas Belón" <carenas@gmail•com>
Cc: phillip.wood@dunelm•org.uk, git@vger•kernel.org,
yoshfuji@linux-ipv6•org, kristofferhaugsbakk@fastmail•com
Subject: Re: [PATCH v2] daemon: correctly handle soft accept() errors in service_loop
Date: Fri, 27 Jun 2025 13:19:18 -0700 [thread overview]
Message-ID: <xmqq34bl7xa1.fsf@gitster.g> (raw)
In-Reply-To: <u4scxaxivz62fsljo7okkfdvcle3zdby6h2sdzd6ed5n6wi5xb@5ekxdycixwxe> ("Carlo Marcelo Arenas Belón"'s message of "Fri, 27 Jun 2025 12:05:15 -0700")
Carlo Marcelo Arenas Belón <carenas@gmail•com> writes:
> On Fri, Jun 27, 2025 at 09:38:47AM -0800, Phillip Wood wrote:
>>
>> On 26/06/2025 18:21, Carlo Marcelo Arenas Belón wrote:
>> >
>> > diff --git a/daemon.c b/daemon.c
>> > index d1be61fd57..f113839781 100644
>> > --- a/daemon.c
>> > +++ b/daemon.c
>> > @@ -1145,6 +1145,7 @@ static int service_loop(struct socketlist *socklist)
>> > for (size_t i = 0; i < socklist->nr; i++) {
>> > if (pfd[i].revents & POLLIN) {
>> > + int incoming;
>> > union {
>> > struct sockaddr sa;
>> > struct sockaddr_in sai;
>> > @@ -1153,11 +1154,19 @@ static int service_loop(struct socketlist *socklist)
>> > #endif
>> > } ss;
>> > socklen_t sslen = sizeof(ss);
>> > - int incoming = accept(pfd[i].fd, &ss.sa, &sslen);
>>
>> Why is the declaration of incoming moved but retry is declared here?
>
> Separating the declaration and assignment for incoming is needed so we can
> insert a label for goto; moving it up just removes distractions so the rest
> of the logic is clearly in view.
>
> Obviously that includes the definition and assignment for retry.
>
> How would you suggest to arrange this better?
I think what Phillip meant was more like this, perhaps.
socklen_t sslen = sizeof(ss);
- int incoming = accept(pfd[i].fd, &ss.sa, &sslen);
+ int incoming;
+ int retry = 3;
+
+ incoming = accept(pfd[i].fd, &ss.sa, &sslen);
if (incoming < 0) {
...
next prev parent reply other threads:[~2025-06-27 20:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-26 16:10 [PATCH] daemon: correctly handle soft accept() errors Carlo Marcelo Arenas Belón
2025-06-26 16:15 ` Kristoffer Haugsbakk
2025-06-26 17:21 ` [PATCH v2] daemon: correctly handle soft accept() errors in service_loop Carlo Marcelo Arenas Belón
2025-06-27 8:38 ` Phillip Wood
2025-06-27 19:05 ` Carlo Marcelo Arenas Belón
2025-06-27 20:19 ` Junio C Hamano [this message]
2025-06-27 23:05 ` Carlo Marcelo Arenas Belón
2025-06-27 23:25 ` Hridoy Ahmed
2025-06-27 23:53 ` Junio C Hamano
2025-06-30 8:59 ` Phillip Wood
2025-06-27 23:14 ` [PATCH v3] " Carlo Marcelo Arenas Belón
2025-06-30 9:00 ` Phillip Wood
2025-06-30 15:33 ` Junio C Hamano
2025-07-01 19:33 ` Phillip Wood
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq34bl7xa1.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=carenas@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=kristofferhaugsbakk@fastmail$(echo .)com \
--cc=phillip.wood@dunelm$(echo .)org.uk \
--cc=yoshfuji@linux-ipv6$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox