From: DJ Delorie <dj@redhat.com>
To: Siddhesh Poyarekar <siddhesh@sourceware.org>
Cc: libc-alpha@sourceware.org
Subject: Re: [PATCH v2 04/12] gaih_inet: Simplify service resolution
Date: Wed, 16 Mar 2022 20:48:19 -0400 [thread overview]
Message-ID: <xnczilieuk.fsf@greed.delorie.com> (raw)
In-Reply-To: <20220314094835.1159523-5-siddhesh@sourceware.org> (message from Siddhesh Poyarekar via Libc-alpha on Mon, 14 Mar 2022 15:18:27 +0530)
Siddhesh Poyarekar via Libc-alpha <libc-alpha@sourceware.org> writes:
> Refactor the code to split out the service resolution code into a
> separate function. Allocate the service tuples array just once to the
> size of the typeproto array, thus avoiding the unnecessary pointer
> chasing and stack allocations.
LGTM
Reviewed-by: DJ Delorie <dj@redhat.com>
> struct gaih_servtuple
> {
> - struct gaih_servtuple *next;
> int socktype;
> int protocol;
> int port;
> + bool set;
> };
>
> -static const struct gaih_servtuple nullserv;
> -
Ok.
> @@ -180,11 +178,11 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp,
> }
> while (r);
>
> - st->next = NULL;
> st->socktype = tp->socktype;
> st->protocol = ((tp->protoflag & GAI_PROTO_PROTOANY)
> ? req->ai_protocol : tp->protocol);
> st->port = s->s_port;
> + st->set = true;
Ok.
> @@ -375,20 +373,11 @@ process_canonname (const struct addrinfo *req, const char *orig_name,
> }
>
> static int
> -gaih_inet (const char *name, const struct gaih_service *service,
> - const struct addrinfo *req, struct addrinfo **pai,
> - unsigned int *naddrs, struct scratch_buffer *tmpbuf)
> +get_servtuples (const struct gaih_service *service, const struct addrinfo *req,
> + struct gaih_servtuple *st, struct scratch_buffer *tmpbuf)
> {
Split out but the names of passed variables remain the same; ok.
> + int i;
> const struct gaih_typeproto *tp = gaih_inet_typeproto;
> - struct gaih_servtuple *st = (struct gaih_servtuple *) &nullserv;
> - struct gaih_addrtuple *at = NULL;
> - bool got_ipv6 = false;
> - char *canon = NULL;
> - const char *orig_name = name;
> -
> - /* Reserve stack memory for the scratch buffer in the getaddrinfo
> - function. */
> - size_t alloca_used = sizeof (struct scratch_buffer);
This part done in the parent function; ok.
> @@ -410,98 +399,88 @@ gaih_inet (const char *name, const struct gaih_service *service,
> }
> }
>
> - int port = 0;
> - if (service != NULL)
> + if (service != NULL && (tp->protoflag & GAI_PROTO_NOSERVICE) != 0)
> + return -EAI_SERVICE;
> +
> + if (service == NULL || service->num >= 0)
> {
> - if ((tp->protoflag & GAI_PROTO_NOSERVICE) != 0)
> - return -EAI_SERVICE;
> + int port = service != NULL ? htons (service->num) : 0;
Ok.
> + if (req->ai_socktype || req->ai_protocol)
> {
> + st[0].socktype = tp->socktype;
> + st[0].protocol = ((tp->protoflag & GAI_PROTO_PROTOANY)
> + ? req->ai_protocol : tp->protocol);
> + st[0].port = port;
> + st[0].set = true;
> + return 0;
> + }
ok.
> + /* Neither socket type nor protocol is set. Return all socket types
> + we know about. */
> + for (i = 0, ++tp; tp->name[0]; ++tp)
> + if (tp->defaultflag)
> + {
> + st[i].socktype = tp->socktype;
> + st[i].protocol = tp->protocol;
> + st[i].port = port;
> + st[i++].set = true;
> + }
Ok.
> - if (service->num < 0)
> - if (tp->name[0])
> - {
> - st = (struct gaih_servtuple *)
> - alloca_account (sizeof (struct gaih_servtuple), alloca_used);
> -
> - int rc = gaih_inet_serv (service->name, tp, req, st, tmpbuf);
> - if (__glibc_unlikely (rc != 0))
> - return rc;
> - }
> - else
> - {
> - struct gaih_servtuple **pst = &st;
> - for (tp++; tp->name[0]; tp++)
> - {
> - struct gaih_servtuple *newp;
>
> - if ((tp->protoflag & GAI_PROTO_NOSERVICE) != 0)
> - continue;
>
> - if (req->ai_socktype != 0
> - && req->ai_socktype != tp->socktype)
> - continue;
> - if (req->ai_protocol != 0
> - && !(tp->protoflag & GAI_PROTO_PROTOANY)
> - && req->ai_protocol != tp->protocol)
> - continue;
>
> - newp = (struct gaih_servtuple *)
> - alloca_account (sizeof (struct gaih_servtuple),
> - alloca_used);
> + return 0;
> + }
Ok.
> - if (gaih_inet_serv (service->name,
> - tp, req, newp, tmpbuf) != 0)
> - continue;
Ok.
> + if (tp->name[0])
> + return gaih_inet_serv (service->name, tp, req, st, tmpbuf);
Ok.
> + for (i = 0, tp++; tp->name[0]; tp++)
> + if ((tp->protoflag & GAI_PROTO_NOSERVICE) != 0)
> + continue;
> + if (req->ai_socktype != 0
> + && req->ai_socktype != tp->socktype)
> + continue;
> + if (req->ai_protocol != 0
> + && !(tp->protoflag & GAI_PROTO_PROTOANY)
> + && req->ai_protocol != tp->protocol)
> + continue;
> + if (gaih_inet_serv (service->name,
> + tp, req, &st[i], tmpbuf) != 0)
> + continue;
> + i++;
> + if (!st[0].set)
> + return -EAI_SERVICE;
> +
> + return 0;
> +}
Ok.
> - *pst = newp;
> - pst = &(newp->next);
> - }
> - if (st == (struct gaih_servtuple *) &nullserv)
> - return -EAI_SERVICE;
> - }
> - }
> - else
> - {
> - port = htons (service->num);
> - goto got_port;
> - }
> - }
> - else
> {
> - got_port:
>
> - if (req->ai_socktype || req->ai_protocol)
> - {
> - st = alloca_account (sizeof (struct gaih_servtuple), alloca_used);
> - st->next = NULL;
> - st->socktype = tp->socktype;
> - st->protocol = ((tp->protoflag & GAI_PROTO_PROTOANY)
> - ? req->ai_protocol : tp->protocol);
> - st->port = port;
> - }
> - else
> - {
> - /* Neither socket type nor protocol is set. Return all socket types
> - we know about. */
> - struct gaih_servtuple **lastp = &st;
> - for (++tp; tp->name[0]; ++tp)
> - if (tp->defaultflag)
> - {
> - struct gaih_servtuple *newp;
>
> - newp = alloca_account (sizeof (struct gaih_servtuple),
> - alloca_used);
> - newp->next = NULL;
> - newp->socktype = tp->socktype;
> - newp->protocol = tp->protocol;
> - newp->port = port;
>
> - *lastp = newp;
> - lastp = &newp->next;
> - }
> - }
> }
Ok.
> +
> +static int
> +gaih_inet (const char *name, const struct gaih_service *service,
> + const struct addrinfo *req, struct addrinfo **pai,
> + unsigned int *naddrs, struct scratch_buffer *tmpbuf)
> +{
> + struct gaih_servtuple st[sizeof (gaih_inet_typeproto)
> + / sizeof (struct gaih_typeproto)] = {0};
> +
> + struct gaih_addrtuple *at = NULL;
> + bool got_ipv6 = false;
> + char *canon = NULL;
> + const char *orig_name = name;
> +
> + /* Reserve stack memory for the scratch buffer in the getaddrinfo
> + function. */
> + size_t alloca_used = sizeof (struct scratch_buffer);
> +
> + int rc;
> + if ((rc = get_servtuples (service, req, st, tmpbuf)) != 0)
> + return rc;
> +
Ok.
> - struct gaih_servtuple *st2;
Ok.
> - for (st2 = st; st2 != NULL; st2 = st2->next)
> + for (int i = 0; st[i].set; i++)
Ok.
> - ai->ai_socktype = st2->socktype;
> - ai->ai_protocol = st2->protocol;
> + ai->ai_socktype = st[i].socktype;
> + ai->ai_protocol = st[i].protocol;
Ok.
> - sin6p->sin6_port = st2->port;
> + sin6p->sin6_port = st[i].port;
Ok.
> - sinp->sin_port = st2->port;
> + sinp->sin_port = st[i].port;
Ok.
next prev parent reply other threads:[~2022-03-17 0:48 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-08 10:07 [PATCH 00/12] getaddrinfo facelift and fixes Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 01/12] Simplify allocations and fix merge and continue actions [BZ #28931] Siddhesh Poyarekar
2022-03-08 13:52 ` Siddhesh Poyarekar
2022-03-08 21:12 ` Carlos O'Donell
2022-03-09 17:13 ` Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 02/12] gaih_inet: Simplify canon name resolution Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 03/12] getaddrinfo: Fix leak with AI_ALL [BZ #28852] Siddhesh Poyarekar
2022-03-08 11:00 ` Andreas Schwab
2022-03-08 13:45 ` Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 04/12] gaih_inet: Simplify service resolution Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 05/12] gaih_inet: make numeric lookup a separate routine Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 06/12] gaih_inet: Split simple gethostbyname into its own function Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 07/12] gaih_inet: Split nscd lookup code " Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 08/12] gaih_inet: separate nss lookup loop " Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 09/12] gaih_inet: make gethosts into a function Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 10/12] gaih_inet: split loopback lookup into its own function Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 11/12] gaih_inet: Split result generation " Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 12/12] gethosts: Return EAI_MEMORY on allocation failure Siddhesh Poyarekar
2022-03-14 9:48 ` [PATCH v2 00/12] getaddrinfo facelift and fixes Siddhesh Poyarekar
2022-03-14 9:48 ` [PATCH v2 01/12] Simplify allocations and fix merge and continue actions [BZ #28931] Siddhesh Poyarekar
2022-03-14 10:30 ` Andreas Schwab
2022-03-14 14:15 ` Siddhesh Poyarekar
2022-03-16 20:47 ` DJ Delorie
2022-03-17 1:39 ` Siddhesh Poyarekar
2022-03-14 9:48 ` [PATCH v2 02/12] gaih_inet: Simplify canon name resolution Siddhesh Poyarekar
2022-03-16 21:12 ` DJ Delorie
2022-03-14 9:48 ` [PATCH v2 03/12] getaddrinfo: Fix leak with AI_ALL [BZ #28852] Siddhesh Poyarekar
2022-03-16 23:42 ` DJ Delorie
2022-03-17 2:30 ` Siddhesh Poyarekar
2022-03-14 9:48 ` [PATCH v2 04/12] gaih_inet: Simplify service resolution Siddhesh Poyarekar
2022-03-17 0:48 ` DJ Delorie [this message]
2022-03-14 9:48 ` [PATCH v2 05/12] gaih_inet: make numeric lookup a separate routine Siddhesh Poyarekar
2022-03-17 4:10 ` DJ Delorie
2022-03-14 9:48 ` [PATCH v2 06/12] gaih_inet: Split simple gethostbyname into its own function Siddhesh Poyarekar
2022-03-17 4:20 ` DJ Delorie
2022-03-14 9:48 ` [PATCH v2 07/12] gaih_inet: Split nscd lookup code " Siddhesh Poyarekar
2022-03-17 4:31 ` DJ Delorie
2022-03-17 6:22 ` Siddhesh Poyarekar
2022-03-14 9:48 ` [PATCH v2 08/12] gaih_inet: separate nss lookup loop " Siddhesh Poyarekar
2022-03-17 4:42 ` DJ Delorie
2022-03-17 4:59 ` Siddhesh Poyarekar
2022-03-14 9:48 ` [PATCH v2 09/12] gaih_inet: make gethosts into a function Siddhesh Poyarekar
2022-03-17 4:44 ` DJ Delorie
2022-03-14 9:48 ` [PATCH v2 10/12] gaih_inet: split loopback lookup into its own function Siddhesh Poyarekar
2022-03-17 4:51 ` DJ Delorie
2022-03-14 9:48 ` [PATCH v2 11/12] gaih_inet: Split result generation " Siddhesh Poyarekar
2022-03-17 5:05 ` DJ Delorie
2022-03-17 5:11 ` Siddhesh Poyarekar
2022-03-14 9:48 ` [PATCH v2 12/12] gethosts: Return EAI_MEMORY on allocation failure Siddhesh Poyarekar
2022-03-17 5:06 ` DJ Delorie
2022-03-14 13:21 ` [PATCH 00/12] getaddrinfo facelift and fixes Cristian Rodríguez
2022-03-14 14:16 ` Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 " Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 01/12] Simplify allocations and fix merge and continue actions [BZ #28931] Siddhesh Poyarekar
2022-03-17 21:47 ` DJ Delorie
2022-03-17 8:11 ` [PATCH v3 02/12] gaih_inet: Simplify canon name resolution Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 03/12] getaddrinfo: Fix leak with AI_ALL [BZ #28852] Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 04/12] gaih_inet: Simplify service resolution Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 05/12] gaih_inet: make numeric lookup a separate routine Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 06/12] gaih_inet: Split simple gethostbyname into its own function Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 07/12] gaih_inet: Split nscd lookup code " Siddhesh Poyarekar
2022-03-17 22:02 ` DJ Delorie
2022-03-17 8:11 ` [PATCH v3 08/12] gaih_inet: separate nss lookup loop " Siddhesh Poyarekar
2022-03-17 22:05 ` DJ Delorie
2022-03-17 8:11 ` [PATCH v3 09/12] gaih_inet: make gethosts into a function Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 10/12] gaih_inet: split loopback lookup into its own function Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 11/12] gaih_inet: Split result generation " Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 12/12] gethosts: Return EAI_MEMORY on allocation failure Siddhesh Poyarekar
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=xnczilieuk.fsf@greed.delorie.com \
--to=dj@redhat.com \
--cc=libc-alpha@sourceware.org \
--cc=siddhesh@sourceware.org \
/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.
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).