From: Frederic Berat <fberat@redhat.com>
To: Siddhesh Poyarekar <siddhesh@gotplt.org>
Cc: libc-alpha@sourceware.org
Subject: Re: [PATCH] Move {read,write}_all functions to a dedicated header
Date: Fri, 2 Jun 2023 08:10:39 +0200 [thread overview]
Message-ID: <CAObJKZoXheugEnW6ppP1qev27S_9hRSixGVjJZDaSrQh0z_=_Q@mail.gmail.com> (raw)
In-Reply-To: <d080b5fc-fe02-8a35-07f4-4ee93c3aa941@gotplt.org>
On Thu, Jun 1, 2023 at 7:08 PM Siddhesh Poyarekar <siddhesh@gotplt.org> wrote:
>
> On 2023-06-01 11:55, Frédéric Bérat wrote:
> > Since these functions are used in both catgets/gencat.c and
> > malloc/memusage{,stat}.c, it make sense to move them into a dedicated
> > header where they can be inlined.
> > ---
> > catgets/gencat.c | 22 +-------------------
> > include/unistd_ext.h | 48 +++++++++++++++++++++++++++++++++++++++++++
> > malloc/memusage.c | 25 +---------------------
> > malloc/memusagestat.c | 40 +-----------------------------------
> > 4 files changed, 51 insertions(+), 84 deletions(-)
> > create mode 100644 include/unistd_ext.h
>
> This should ideally have been sent in with the rest of the series,
> otherwise it simply breaks pre-commit CI testing:
>
> https://patchwork.sourceware.org/project/glibc/patch/20230601155556.104745-1-fberat@redhat.com/
>
Arf, I will take note for later :(
> >
> > diff --git a/catgets/gencat.c b/catgets/gencat.c
> > index 826596c2e4..9cacc801b5 100644
> > --- a/catgets/gencat.c
> > +++ b/catgets/gencat.c
> > @@ -37,6 +37,7 @@
> > #include <stdlib.h>
> > #include <string.h>
> > #include <unistd.h>
> > +#include <unistd_ext.h>
> > #include <wchar.h>
> >
> > #include "version.h"
> > @@ -838,27 +839,6 @@ invalid character: message ignored"));
> > return current;
> > }
> >
> > -static void
> > -write_all (int fd, const void *buffer, size_t length)
> > -{
> > - const char *p = buffer;
> > - const char *end = p + length;
> > - while (p < end)
> > - {
> > - ssize_t ret = write (fd, p, end - p);
> > - if (ret < 0)
> > - error (EXIT_FAILURE, errno,
> > - gettext ("write of %zu bytes failed after %td: %m"),
> > - length, p - (const char *) buffer);
> > -
> > - if (ret == 0)
> > - error (EXIT_FAILURE, 0,
> > - gettext ("write returned 0 after writing %td bytes of %zu"),
> > - p - (const char *) buffer, length);
> > - p += ret;
> > - }
> > -}
> > -
> > static void
> > write_out (struct catalog *catalog, const char *output_name,
> > const char *header_name)
> > diff --git a/include/unistd_ext.h b/include/unistd_ext.h
> > new file mode 100644
> > index 0000000000..b6ce067efb
> > --- /dev/null
> > +++ b/include/unistd_ext.h
>
> This needs a copyright header.
>
What's the rule for that ? It's a bit confusing since there isn't a
copyright header in most of the headers in "include", so I assumed it
didn't need it.
> > @@ -0,0 +1,48 @@
> > +#ifndef _UNISTD_EXT_H
> > +#define _UNISTD_EXT_H
> > +
> > +#include <error.h>
> > +#include <errno.h>
> > +#include <libintl.h>
> > +#include <unistd.h>
> > +
> > +/* Helpers used in catgets/gencat.c and malloc/memusage*.c */
> > +static inline void
> > +write_all (int fd, const void *buffer, size_t length)
> > +{
> > + const char *p = buffer;
> > + const char *end = p + length;
> > + while (p < end)
> > + {
> > + ssize_t ret = write (fd, p, end - p);
> > + if (ret < 0)
> > + error (EXIT_FAILURE, errno,
> > + gettext ("write of %zu bytes failed after %td: %m"),
> > + length, p - (const char *) buffer);
> > +
> > + if (ret == 0)
> > + error (EXIT_FAILURE, 0,
> > + gettext ("write returned 0 after writing %td bytes of %zu"),
> > + p - (const char *) buffer, length);
> > + p += ret;
> > + }
> > +}
> > +
> > +static inline void
> > +read_all (int fd, void *buffer, size_t length)
> > +{
> > + char *p = buffer;
> > + char *end = p + length;
> > + while (p < end)
> > + {
> > + ssize_t ret = read (fd, p, end - p);
> > + if (ret < 0)
> > + error (EXIT_FAILURE, errno,
> > + gettext ("read of %zu bytes failed after %td: %m"),
> > + length, p - (char *) buffer);
> > +
> > + p += ret;
> > + }
> > +}
> > +
> > +#endif
> > diff --git a/malloc/memusage.c b/malloc/memusage.c
> > index 53a3630651..1c6930188c 100644
> > --- a/malloc/memusage.c
> > +++ b/malloc/memusage.c
> > @@ -18,10 +18,7 @@
> >
> > #include <assert.h>
> > #include <dlfcn.h>
> > -#include <errno.h>
> > -#include <error.h>
> > #include <fcntl.h>
> > -#include <libintl.h>
>
> You shouldn't remove these headers because gettext gets used despite the
> unistd_ext.h usage, resulting in an implicit, transitive dependency.
> Does it break anything if you don't remove these includes?
>
Nothing breaks if I keep these headers.
I actually removed them because they were added in the patch that
introduced write_all/read_all.
Since I moved write/read_all in the header, I removed the headers that
were introduced with them, but I admit I didn't check if they were
actually missing before that.
> > #include <stdatomic.h>
> > #include <stdbool.h>
> > #include <stdio.h>
> > @@ -30,6 +27,7 @@
> > #include <sys/mman.h>
> > #include <sys/time.h>
> > #include <unistd.h>
> > +#include <unistd_ext.h>
> >
> > #include <hp-timing.h>
> > #include <machine-sp.h>
> > @@ -145,27 +143,6 @@ peak_atomic_max (_Atomic size_t *peak, size_t val)
> > while (! atomic_compare_exchange_weak (peak, &v, val));
> > }
> >
> > -static void
> > -write_all (int fd, const void *buffer, size_t length)
> > -{
> > - const char *p = buffer;
> > - const char *end = p + length;
> > - while (p < end)
> > - {
> > - ssize_t ret = write (fd, p, end - p);
> > - if (ret < 0)
> > - error (EXIT_FAILURE, errno,
> > - gettext ("write of %zu bytes failed after %td: %m"),
> > - length, p - (const char *) buffer);
> > -
> > - if (ret == 0)
> > - error (EXIT_FAILURE, 0,
> > - gettext ("write returned 0 after writing %td bytes of %zu"),
> > - p - (const char *) buffer, length);
> > - p += ret;
> > - }
> > -}
> > -
> > /* Update the global data after a successful function call. */
> > static void
> > update_data (struct header *result, size_t len, size_t old_len)
> > diff --git a/malloc/memusagestat.c b/malloc/memusagestat.c
> > index cc066d4af9..837b613c2b 100644
> > --- a/malloc/memusagestat.c
> > +++ b/malloc/memusagestat.c
> > @@ -29,6 +29,7 @@
> > #include <stdlib.h>
> > #include <string.h>
> > #include <unistd.h>
> > +#include <unistd_ext.h>
> > #include <stdint.h>
> > #include <sys/param.h>
> > #include <sys/stat.h>
> > @@ -114,45 +115,6 @@ static int time_based;
> > static int also_total = 0;
> >
> >
> > -static void
> > -read_all (int fd, void *buffer, size_t length)
> > -{
> > - char *p = buffer;
> > - char *end = p + length;
> > - while (p < end)
> > - {
> > - ssize_t ret = read (fd, p, end - p);
> > - if (ret < 0)
> > - error (EXIT_FAILURE, errno,
> > - gettext ("read of %zu bytes failed after %td: %m"),
> > - length, p - (char *) buffer);
> > -
> > - p += ret;
> > - }
> > -}
> > -
> > -static void
> > -write_all (int fd, const void *buffer, size_t length)
> > -{
> > - const char *p = buffer;
> > - const char *end = p + length;
> > - while (p < end)
> > - {
> > - ssize_t ret = write (fd, p, end - p);
> > - if (ret < 0)
> > - error (EXIT_FAILURE, errno,
> > - gettext ("write of %zu bytes failed after %td: %m"),
> > - length, p - (const char *) buffer);
> > -
> > - if (ret == 0)
> > - error (EXIT_FAILURE, 0,
> > - gettext ("write returned 0 after writing %td bytes of %zu"),
> > - p - (const char *) buffer, length);
> > - p += ret;
> > - }
> > -}
> > -
> > -
> > int
> > main (int argc, char *argv[])
> > {
>
next prev parent reply other threads:[~2023-06-02 6:10 UTC|newest]
Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-18 12:11 [PATCH 0/8] Fix warn unused result Frédéric Bérat
2023-04-18 12:11 ` [PATCH 1/8] tests: fix " Frédéric Bérat
2023-04-18 12:23 ` Siddhesh Poyarekar
2023-04-28 12:21 ` [PATCH v4 07/15] tests: fix warn unused result on asprintf calls Frédéric Bérat
2023-05-25 1:07 ` Siddhesh Poyarekar
2023-05-31 14:36 ` Frederic Berat
2023-04-28 12:21 ` [PATCH v4 08/15] tests: replace write by xwrite Frédéric Bérat
2023-05-25 1:16 ` Siddhesh Poyarekar
2023-06-01 16:39 ` Siddhesh Poyarekar
2023-04-28 12:21 ` [PATCH v4 09/15] tests: replace read by xread Frédéric Bérat
2023-04-28 12:21 ` [PATCH v4 10/15] tests: replace system by xsystem Frédéric Bérat
2023-05-25 1:22 ` Siddhesh Poyarekar
2023-04-28 12:21 ` [PATCH v4 11/15] tests: replace fread by xfread Frédéric Bérat
2023-04-28 12:21 ` [PATCH v4 12/15] tests: replace ftruncate by xftruncate Frédéric Bérat
2023-05-25 1:25 ` Siddhesh Poyarekar
2023-06-01 16:42 ` Siddhesh Poyarekar
2023-04-28 12:21 ` [PATCH v4 13/15] tests: replace fgets by xfgets Frédéric Bérat
2023-04-28 12:21 ` [PATCH v4 14/15] tests: Replace various function calls with their x variant Frédéric Bérat
2023-05-25 1:29 ` Siddhesh Poyarekar
2023-05-25 16:10 ` Frederic Berat
2023-04-28 12:21 ` [PATCH v4 15/15] tests: fix warn unused results Frédéric Bérat
2023-05-25 1:35 ` Siddhesh Poyarekar
2023-06-01 14:27 ` [PATCH v5 04/12] tests: fix warn unused result on asprintf calls Frédéric Bérat
2023-06-01 16:52 ` Siddhesh Poyarekar
2023-06-01 14:27 ` [PATCH v5 07/12] tests: replace system by xsystem Frédéric Bérat
2023-06-01 16:56 ` Siddhesh Poyarekar
2023-06-01 14:27 ` [PATCH v5 12/12] tests: fix warn unused results Frédéric Bérat
2023-06-01 16:57 ` Siddhesh Poyarekar
2023-04-18 12:11 ` [PATCH 2/8] catgets/gencat.c: fix warn unused result Frédéric Bérat
2023-04-18 12:36 ` Siddhesh Poyarekar
2023-04-28 12:21 ` [PATCH v4 01/15] " Frédéric Bérat
2023-05-24 22:47 ` Siddhesh Poyarekar
2023-06-01 14:27 ` [PATCH v5 01/12] " Frédéric Bérat
2023-06-01 16:47 ` Siddhesh Poyarekar
2023-04-18 12:11 ` [PATCH 3/8] inet/rcmd.c: " Frédéric Bérat
2023-04-18 12:37 ` Siddhesh Poyarekar
2023-04-18 13:40 ` Andreas Schwab
2023-04-18 13:50 ` Siddhesh Poyarekar
2023-04-18 12:11 ` [PATCH 4/8] locale/programs/locarchive.c: " Frédéric Bérat
2023-04-18 12:43 ` Siddhesh Poyarekar
2023-04-28 12:21 ` [PATCH v4 02/15] " Frédéric Bérat
2023-05-24 22:49 ` Siddhesh Poyarekar
2023-06-01 14:27 ` [PATCH v5 02/12] malloc/{memusage.c,memusagestat.c}: " Frédéric Bérat
2023-06-01 16:49 ` Siddhesh Poyarekar
2023-04-18 12:11 ` [PATCH 5/8] " Frédéric Bérat
2023-04-18 12:47 ` [PATCH 5/8] malloc/{memusage.c, memusagestat.c}: " Siddhesh Poyarekar
2023-04-28 12:21 ` [PATCH v4 03/15] malloc/{memusage.c,memusagestat.c}: " Frédéric Bérat
2023-05-25 0:50 ` Siddhesh Poyarekar
2023-06-01 15:55 ` [PATCH] Move {read,write}_all functions to a dedicated header Frédéric Bérat
2023-06-01 17:07 ` Siddhesh Poyarekar
2023-06-02 6:10 ` Frederic Berat [this message]
2023-06-02 10:01 ` Siddhesh Poyarekar
2023-04-18 12:11 ` [PATCH 6/8] nptl_db/thread_dbP.h: fix warn unused result Frédéric Bérat
2023-04-18 12:49 ` Siddhesh Poyarekar
2023-04-18 12:51 ` Siddhesh Poyarekar
2023-04-28 12:21 ` [PATCH v4 04/15] " Frédéric Bérat
2023-05-25 0:51 ` Siddhesh Poyarekar
2023-05-25 1:52 ` Siddhesh Poyarekar
2023-06-01 14:27 ` [PATCH v5 03/12] " Frédéric Bérat
2023-06-01 16:49 ` Siddhesh Poyarekar
2023-04-18 12:11 ` [PATCH 7/8] sunrpc/netname.c: " Frédéric Bérat
2023-04-18 12:51 ` Siddhesh Poyarekar
2023-04-28 12:21 ` [PATCH v4 05/15] " Frédéric Bérat
2023-05-25 0:53 ` Siddhesh Poyarekar
2023-04-18 12:11 ` [PATCH 8/8] sysdeps/pthread/eintr.c: " Frédéric Bérat
2023-04-18 12:54 ` Siddhesh Poyarekar
2023-04-28 12:21 ` [PATCH v4 06/15] " Frédéric Bérat
2023-05-25 0:59 ` Siddhesh Poyarekar
2023-04-28 12:21 ` [PATCH v4 00/15] Fix " Frédéric Bérat
2023-05-25 1:53 ` Siddhesh Poyarekar
2023-06-02 15:28 ` [PATCH v6 0/7] " Frédéric Bérat
2023-06-02 15:28 ` [PATCH v6 1/7] tests: fix warn unused result on asprintf calls Frédéric Bérat
2023-06-06 6:18 ` Siddhesh Poyarekar
2023-06-02 15:28 ` [PATCH v6 2/7] tests: replace read by xread Frédéric Bérat
2023-06-06 6:21 ` Siddhesh Poyarekar
2023-06-06 8:00 ` Frederic Berat
2023-06-12 14:22 ` Siddhesh Poyarekar
2023-06-07 19:04 ` Frederic Berat
2023-06-02 15:28 ` [PATCH v6 3/7] tests: replace system by xsystem Frédéric Bérat
2023-06-06 12:17 ` Siddhesh Poyarekar
2023-06-02 15:28 ` [PATCH v6 4/7] tests: replace fread by xfread Frédéric Bérat
2023-06-06 12:18 ` Siddhesh Poyarekar
2023-06-07 19:03 ` Frederic Berat
2023-06-02 15:28 ` [PATCH v6 5/7] tests: replace fgets by xfgets Frédéric Bérat
2023-06-06 12:20 ` Siddhesh Poyarekar
2023-06-08 5:50 ` Maxim Kuvyrkov
2023-06-08 6:57 ` Frederic Berat
2023-06-02 15:28 ` [PATCH v6 6/7] tests: Replace various function calls with their x variant Frédéric Bérat
2023-06-06 12:20 ` Siddhesh Poyarekar
2023-06-02 15:28 ` [PATCH v6 7/7] Move {read,write}_all functions to a dedicated header Frédéric Bérat
2023-06-06 12:21 ` Siddhesh Poyarekar
2023-06-12 15:18 ` [PATCH v7 0/4] Fix warn unused result Frédéric Bérat
2023-06-12 15:18 ` [PATCH v7 1/4] tests: replace read by xread Frédéric Bérat
2023-06-12 16:57 ` Joseph Myers
2023-06-13 14:22 ` Frederic Berat
2023-06-14 8:52 ` [PATCH v8 1/2] " Frédéric Bérat
2023-06-14 11:51 ` Siddhesh Poyarekar
2023-06-12 15:18 ` [PATCH v7 2/4] tests: replace system by xsystem Frédéric Bérat
2023-06-13 14:10 ` Siddhesh Poyarekar
2023-06-13 14:13 ` Adhemerval Zanella Netto
2023-06-13 14:16 ` Siddhesh Poyarekar
2023-06-14 8:52 ` [PATCH 2/2] " Frédéric Bérat
2023-06-14 11:53 ` Siddhesh Poyarekar
2023-06-12 15:18 ` [PATCH v7 3/4] tests: replace fread by xfread Frédéric Bérat
2023-06-13 23:57 ` Siddhesh Poyarekar
2023-06-12 15:18 ` [PATCH v7 4/4] tests: replace fgets by xfgets Frédéric Bérat
2023-06-13 12:23 ` Siddhesh Poyarekar
2023-06-13 18:25 ` Joseph Myers
2023-06-13 23:56 ` 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='CAObJKZoXheugEnW6ppP1qev27S_9hRSixGVjJZDaSrQh0z_=_Q@mail.gmail.com' \
--to=fberat@redhat.com \
--cc=libc-alpha@sourceware.org \
--cc=siddhesh@gotplt.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).