From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2206) id F2F33385773A; Tue, 6 Jun 2023 12:24:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F2F33385773A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1686054262; bh=Ryy+5QPclu7PbCVHKr8T/3BHztKe/njLGfi6mjm0DFA=; h=From:To:Subject:Date:From; b=qsIQxg5S5yb7VjVi/5uSS9RjHxxpbJlxR3SmbDVF/5TOS7w9TpjnPy1FWSFX9kIxr oBoAKvrqr5DL+ROJotkJmSDDQclBQxUzD3/39ujloeyO7JreRKjQW5zY2EIEpXdgRZ xYHAgZ6kijCnuuzCLtRMpv9tf5TsTS13KF86yU24= MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Siddhesh Poyarekar To: glibc-cvs@sourceware.org Subject: [glibc] Move {read,write}_all functions to a dedicated header X-Act-Checkin: glibc X-Git-Author: =?utf-8?b?RnLDqWTDqXJpYyBCw6lyYXQ=?= X-Git-Refname: refs/heads/master X-Git-Oldrev: f6a532fbd0f430dc4ded254d713d89fcbafc1b7e X-Git-Newrev: 200ae471b65354eed6f1bc7658f898f2f380951a Message-Id: <20230606122422.F2F33385773A@sourceware.org> Date: Tue, 6 Jun 2023 12:24:22 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=200ae471b65354eed6f1bc7658f898f2f380951a commit 200ae471b65354eed6f1bc7658f898f2f380951a Author: Frédéric Bérat Date: Fri Jun 2 17:28:12 2023 +0200 Move {read,write}_all functions to a dedicated header 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. Reviewed-by: Siddhesh Poyarekar Diff: --- catgets/gencat.c | 22 +---------------- include/unistd_ext.h | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++ malloc/memusage.c | 22 +---------------- malloc/memusagestat.c | 40 +------------------------------ 4 files changed, 69 insertions(+), 81 deletions(-) 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 #include #include +#include #include #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..8c93bde88b --- /dev/null +++ b/include/unistd_ext.h @@ -0,0 +1,66 @@ +/* unistd.h related helpers. + Copyright (C) 2023 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _UNISTD_EXT_H +#define _UNISTD_EXT_H + +#include +#include +#include +#include + +/* 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..cd675e16a6 100644 --- a/malloc/memusage.c +++ b/malloc/memusage.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -145,27 +146,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 #include #include +#include #include #include #include @@ -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[]) {