From patchwork Fri Jun 2 15:28:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederic Berat X-Patchwork-Id: 70534 X-Patchwork-Delegate: siddhesh@gotplt.org Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BB498385697F for ; Fri, 2 Jun 2023 15:30:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BB498385697F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1685719814; bh=PWw9F3GZxsa1uy2cgkI6nDQ5eKlXa4BP6iHxISVLcus=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=GdDSGlPKvP5bexsj9aXy6JkXOoVezxsdPKCB25QiRKSVSQ3Z8XW+xDlrtIJVC23oS uaMV97X0pkc1xvSPC6Jn859IQ3GYtXvr3pR9xYkbzPDe9rD5I3VOVuoB3E9eQL+9Op 5F7XH7tUFMMtsM1QmbIigBD+4FhI1kgTljOeMZy8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id E6139385802F for ; Fri, 2 Jun 2023 15:28:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E6139385802F Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-274-3s0R_Q6lPTKGR8kQp-mdsg-1; Fri, 02 Jun 2023 11:28:22 -0400 X-MC-Unique: 3s0R_Q6lPTKGR8kQp-mdsg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4337C3C13A19; Fri, 2 Jun 2023 15:28:22 +0000 (UTC) Received: from Nymeria-redhat.redhat.com (unknown [10.39.193.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9EC9140CFD45; Fri, 2 Jun 2023 15:28:21 +0000 (UTC) To: libc-alpha@sourceware.org Cc: siddhesh@gotplt.org, fberat@redhat.com Subject: [PATCH v6 7/7] Move {read,write}_all functions to a dedicated header Date: Fri, 2 Jun 2023 17:28:12 +0200 Message-Id: <20230602152812.108497-8-fberat@redhat.com> In-Reply-To: <20230602152812.108497-1-fberat@redhat.com> References: <20230602152812.108497-1-fberat@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Fr=C3=A9d=C3=A9ric_B=C3=A9rat_via_Libc-alpha?= From: Frederic Berat Reply-To: =?utf-8?b?RnLDqWTDqXJpYyBCw6lyYXQ=?= Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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 --- Changes since v5: - Adding copyright to unistd_ext.h - Don't remove included headers in memusagestat.c catgets/gencat.c | 22 +-------------- include/unistd_ext.h | 66 +++++++++++++++++++++++++++++++++++++++++++ malloc/memusage.c | 22 +-------------- malloc/memusagestat.c | 40 +------------------------- 4 files changed, 69 insertions(+), 81 deletions(-) create mode 100644 include/unistd_ext.h 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[]) {