From: "Frédéric Bérat" <fberat@redhat.com>
To: libc-alpha@sourceware.org
Cc: siddhesh@gotplt.org, fberat@redhat.com
Subject: [PATCH v5 02/12] malloc/{memusage.c,memusagestat.c}: fix warn unused result
Date: Thu, 1 Jun 2023 16:27:43 +0200 [thread overview]
Message-ID: <20230601142747.104444-2-fberat@redhat.com> (raw)
In-Reply-To: <20230418121130.844302-5-fberat@redhat.com>
Fix unused result warnings, detected when _FORTIFY_SOURCE is enabled in
glibc.
---
Changes since v4:
- Mark strings for translation with gettext.
- Fixed typo in (ret == 0) case
malloc/memusage.c | 54 +++++++++++++++++++++++++++++++++----------
malloc/memusagestat.c | 48 ++++++++++++++++++++++++++++++++++----
2 files changed, 86 insertions(+), 16 deletions(-)
diff --git a/malloc/memusage.c b/malloc/memusage.c
index 2a3a508557..53a3630651 100644
--- a/malloc/memusage.c
+++ b/malloc/memusage.c
@@ -18,7 +18,10 @@
#include <assert.h>
#include <dlfcn.h>
+#include <errno.h>
+#include <error.h>
#include <fcntl.h>
+#include <libintl.h>
#include <stdatomic.h>
#include <stdbool.h>
#include <stdio.h>
@@ -142,6 +145,27 @@ 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)
@@ -210,10 +234,11 @@ update_data (struct header *result, size_t len, size_t old_len)
gettime (&buffer[idx]);
/* Write out buffer if it is full. */
- if (idx + 1 == buffer_size)
- write (fd, buffer, buffer_size * sizeof (struct entry));
- else if (idx + 1 == 2 * buffer_size)
- write (fd, &buffer[buffer_size], buffer_size * sizeof (struct entry));
+ if (idx + 1 == buffer_size || idx + 1 == 2 * buffer_size)
+ {
+ uint32_t write_size = buffer_size * sizeof (buffer[0]);
+ write_all (fd, &buffer[idx + 1 - buffer_size], write_size);
+ }
}
}
@@ -299,8 +324,8 @@ me (void)
first.stack = 0;
gettime (&first);
/* Write it two times since we need the starting and end time. */
- write (fd, &first, sizeof (first));
- write (fd, &first, sizeof (first));
+ write_all (fd, &first, sizeof (first));
+ write_all (fd, &first, sizeof (first));
/* Determine the buffer size. We use the default if the
environment variable is not present. */
@@ -850,24 +875,29 @@ dest (void)
if (fd != -1)
{
/* Write the partially filled buffer. */
+ struct entry *start = buffer;
+ uint32_t write_cnt = buffer_cnt;
+
if (buffer_cnt > buffer_size)
- write (fd, buffer + buffer_size,
- (buffer_cnt - buffer_size) * sizeof (struct entry));
- else
- write (fd, buffer, buffer_cnt * sizeof (struct entry));
+ {
+ start = buffer + buffer_size;
+ write_cnt = buffer_cnt - buffer_size;
+ }
+
+ write_all (fd, start, write_cnt * sizeof (buffer[0]));
/* Go back to the beginning of the file. We allocated two records
here when we opened the file. */
lseek (fd, 0, SEEK_SET);
/* Write out a record containing the total size. */
first.stack = peak_total;
- write (fd, &first, sizeof (struct entry));
+ write_all (fd, &first, sizeof (first));
/* Write out another record containing the maximum for heap and
stack. */
first.heap = peak_heap;
first.stack = peak_stack;
gettime (&first);
- write (fd, &first, sizeof (struct entry));
+ write_all (fd, &first, sizeof (first));
/* Close the file. */
close (fd);
diff --git a/malloc/memusagestat.c b/malloc/memusagestat.c
index 67c5131f79..cc066d4af9 100644
--- a/malloc/memusagestat.c
+++ b/malloc/memusagestat.c
@@ -114,6 +114,45 @@ 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[])
{
@@ -188,7 +227,7 @@ main (int argc, char *argv[])
total = st.st_size / sizeof (struct entry) - 2;
/* Read the administrative information. */
- read (fd, headent, sizeof (headent));
+ read_all (fd, headent, sizeof (headent));
maxsize_heap = headent[1].heap;
maxsize_stack = headent[1].stack;
maxsize_total = headent[0].stack;
@@ -220,7 +259,8 @@ main (int argc, char *argv[])
/* Write the computed values in the file. */
lseek (fd, 0, SEEK_SET);
- write (fd, headent, 2 * sizeof (struct entry));
+ write_all (fd, headent, sizeof (headent));
+
}
if (also_total)
@@ -372,7 +412,7 @@ main (int argc, char *argv[])
size_t new[2];
uint64_t now;
- read (fd, &entry, sizeof (entry));
+ read_all (fd, &entry, sizeof (entry));
now = ((uint64_t) entry.time_high) << 32 | entry.time_low;
@@ -455,7 +495,7 @@ main (int argc, char *argv[])
size_t xpos;
uint64_t now;
- read (fd, &entry, sizeof (entry));
+ read_all (fd, &entry, sizeof (entry));
now = ((uint64_t) entry.time_high) << 32 | entry.time_low;
xpos = 40 + ((xsize - 80) * (now - start_time)) / total_time;
--
2.40.1
next prev parent reply other threads:[~2023-06-01 14:28 UTC|newest]
Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-18 12:11 [PATCH 0/8] Fix " 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 ` Frédéric Bérat [this message]
2023-06-01 16:49 ` [PATCH v5 02/12] malloc/{memusage.c,memusagestat.c}: " 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
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=20230601142747.104444-2-fberat@redhat.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).