diff options
Diffstat (limited to 'malloc')
-rw-r--r-- | malloc/memusage.c | 22 | ||||
-rw-r--r-- | malloc/memusagestat.c | 40 |
2 files changed, 2 insertions, 60 deletions
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 <sys/mman.h> #include <sys/time.h> #include <unistd.h> +#include <unistd_ext.h> #include <hp-timing.h> #include <machine-sp.h> @@ -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 <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[]) { |