mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 00:19:57 +00:00
malloc/{memusage.c, memusagestat.c}: fix warn unused result
Fix unused result warnings, detected when _FORTIFY_SOURCE is enabled in glibc. Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
parent
e76ff03108
commit
b97c5efdca
@ -18,7 +18,10 @@
|
|||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <error.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#include <libintl.h>
|
||||||
#include <stdatomic.h>
|
#include <stdatomic.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stdio.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));
|
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. */
|
/* Update the global data after a successful function call. */
|
||||||
static void
|
static void
|
||||||
update_data (struct header *result, size_t len, size_t old_len)
|
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]);
|
gettime (&buffer[idx]);
|
||||||
|
|
||||||
/* Write out buffer if it is full. */
|
/* Write out buffer if it is full. */
|
||||||
if (idx + 1 == buffer_size)
|
if (idx + 1 == buffer_size || idx + 1 == 2 * buffer_size)
|
||||||
write (fd, buffer, buffer_size * sizeof (struct entry));
|
{
|
||||||
else if (idx + 1 == 2 * buffer_size)
|
uint32_t write_size = buffer_size * sizeof (buffer[0]);
|
||||||
write (fd, &buffer[buffer_size], buffer_size * sizeof (struct entry));
|
write_all (fd, &buffer[idx + 1 - buffer_size], write_size);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -299,8 +324,8 @@ me (void)
|
|||||||
first.stack = 0;
|
first.stack = 0;
|
||||||
gettime (&first);
|
gettime (&first);
|
||||||
/* Write it two times since we need the starting and end time. */
|
/* Write it two times since we need the starting and end time. */
|
||||||
write (fd, &first, sizeof (first));
|
write_all (fd, &first, sizeof (first));
|
||||||
write (fd, &first, sizeof (first));
|
write_all (fd, &first, sizeof (first));
|
||||||
|
|
||||||
/* Determine the buffer size. We use the default if the
|
/* Determine the buffer size. We use the default if the
|
||||||
environment variable is not present. */
|
environment variable is not present. */
|
||||||
@ -850,24 +875,29 @@ dest (void)
|
|||||||
if (fd != -1)
|
if (fd != -1)
|
||||||
{
|
{
|
||||||
/* Write the partially filled buffer. */
|
/* Write the partially filled buffer. */
|
||||||
|
struct entry *start = buffer;
|
||||||
|
uint32_t write_cnt = buffer_cnt;
|
||||||
|
|
||||||
if (buffer_cnt > buffer_size)
|
if (buffer_cnt > buffer_size)
|
||||||
write (fd, buffer + buffer_size,
|
{
|
||||||
(buffer_cnt - buffer_size) * sizeof (struct entry));
|
start = buffer + buffer_size;
|
||||||
else
|
write_cnt = buffer_cnt - buffer_size;
|
||||||
write (fd, buffer, buffer_cnt * sizeof (struct entry));
|
}
|
||||||
|
|
||||||
|
write_all (fd, start, write_cnt * sizeof (buffer[0]));
|
||||||
|
|
||||||
/* Go back to the beginning of the file. We allocated two records
|
/* Go back to the beginning of the file. We allocated two records
|
||||||
here when we opened the file. */
|
here when we opened the file. */
|
||||||
lseek (fd, 0, SEEK_SET);
|
lseek (fd, 0, SEEK_SET);
|
||||||
/* Write out a record containing the total size. */
|
/* Write out a record containing the total size. */
|
||||||
first.stack = peak_total;
|
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
|
/* Write out another record containing the maximum for heap and
|
||||||
stack. */
|
stack. */
|
||||||
first.heap = peak_heap;
|
first.heap = peak_heap;
|
||||||
first.stack = peak_stack;
|
first.stack = peak_stack;
|
||||||
gettime (&first);
|
gettime (&first);
|
||||||
write (fd, &first, sizeof (struct entry));
|
write_all (fd, &first, sizeof (first));
|
||||||
|
|
||||||
/* Close the file. */
|
/* Close the file. */
|
||||||
close (fd);
|
close (fd);
|
||||||
|
@ -114,6 +114,45 @@ static int time_based;
|
|||||||
static int also_total = 0;
|
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
|
int
|
||||||
main (int argc, char *argv[])
|
main (int argc, char *argv[])
|
||||||
{
|
{
|
||||||
@ -188,7 +227,7 @@ main (int argc, char *argv[])
|
|||||||
total = st.st_size / sizeof (struct entry) - 2;
|
total = st.st_size / sizeof (struct entry) - 2;
|
||||||
|
|
||||||
/* Read the administrative information. */
|
/* Read the administrative information. */
|
||||||
read (fd, headent, sizeof (headent));
|
read_all (fd, headent, sizeof (headent));
|
||||||
maxsize_heap = headent[1].heap;
|
maxsize_heap = headent[1].heap;
|
||||||
maxsize_stack = headent[1].stack;
|
maxsize_stack = headent[1].stack;
|
||||||
maxsize_total = headent[0].stack;
|
maxsize_total = headent[0].stack;
|
||||||
@ -220,7 +259,8 @@ main (int argc, char *argv[])
|
|||||||
|
|
||||||
/* Write the computed values in the file. */
|
/* Write the computed values in the file. */
|
||||||
lseek (fd, 0, SEEK_SET);
|
lseek (fd, 0, SEEK_SET);
|
||||||
write (fd, headent, 2 * sizeof (struct entry));
|
write_all (fd, headent, sizeof (headent));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (also_total)
|
if (also_total)
|
||||||
@ -372,7 +412,7 @@ main (int argc, char *argv[])
|
|||||||
size_t new[2];
|
size_t new[2];
|
||||||
uint64_t now;
|
uint64_t now;
|
||||||
|
|
||||||
read (fd, &entry, sizeof (entry));
|
read_all (fd, &entry, sizeof (entry));
|
||||||
|
|
||||||
now = ((uint64_t) entry.time_high) << 32 | entry.time_low;
|
now = ((uint64_t) entry.time_high) << 32 | entry.time_low;
|
||||||
|
|
||||||
@ -455,7 +495,7 @@ main (int argc, char *argv[])
|
|||||||
size_t xpos;
|
size_t xpos;
|
||||||
uint64_t now;
|
uint64_t now;
|
||||||
|
|
||||||
read (fd, &entry, sizeof (entry));
|
read_all (fd, &entry, sizeof (entry));
|
||||||
|
|
||||||
now = ((uint64_t) entry.time_high) << 32 | entry.time_low;
|
now = ((uint64_t) entry.time_high) << 32 | entry.time_low;
|
||||||
xpos = 40 + ((xsize - 80) * (now - start_time)) / total_time;
|
xpos = 40 + ((xsize - 80) * (now - start_time)) / total_time;
|
||||||
|
Loading…
Reference in New Issue
Block a user