diff options
| author | Lukas Czerner <lczerner@redhat.com> | 2022-02-17 10:25:00 +0100 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2022-04-28 13:13:56 -0400 |
| commit | 97079a792dd5e9ea9d4708d2e80244c930a139cd (patch) | |
| tree | c3bfad53adbb3c83480628eb66a07ee9f5346c33 /e2fsck | |
| parent | a282671a02e8fffa04ac0f9db7982fd6bb0a0916 (diff) | |
| download | e2fsprogs-97079a792dd5e9ea9d4708d2e80244c930a139cd.tar.gz | |
Use mallinfo2 instead of mallinfo if available
mallinfo has been deprecated with GNU C library version 2.33 in favor of
mallinfo2 which works exactly the same as mallinfo but with larger field
widths. Use mallinfo2 if available.
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'e2fsck')
| -rw-r--r-- | e2fsck/iscan.c | 11 | ||||
| -rw-r--r-- | e2fsck/util.c | 11 |
2 files changed, 20 insertions, 2 deletions
diff --git a/e2fsck/iscan.c b/e2fsck/iscan.c index 607e47528..33c6a4cdc 100644 --- a/e2fsck/iscan.c +++ b/e2fsck/iscan.c @@ -109,7 +109,16 @@ void print_resource_track(const char *desc, printf("%s: ", desc); #define kbytes(x) (((unsigned long long)(x) + 1023) / 1024) -#ifdef HAVE_MALLINFO +#ifdef HAVE_MALLINFO2 + if (1) { + struct mallinfo2 malloc_info = mallinfo2(); + + printf("Memory used: %lluk/%lluk (%lluk/%lluk), ", + kbytes(malloc_info.arena), kbytes(malloc_info.hblkhd), + kbytes(malloc_info.uordblks), + kbytes(malloc_info.fordblks)); + } else +#elif defined HAVE_MALLINFO /* don't use mallinfo() if over 2GB used, since it returns "int" */ if ((char *)sbrk(0) - (char *)track->brk_start < 2LL << 30) { struct mallinfo malloc_info = mallinfo(); diff --git a/e2fsck/util.c b/e2fsck/util.c index 3fe3c9888..42740d9ef 100644 --- a/e2fsck/util.c +++ b/e2fsck/util.c @@ -430,7 +430,16 @@ void print_resource_track(e2fsck_t ctx, const char *desc, log_out(ctx, "%s: ", desc); #define kbytes(x) (((unsigned long long)(x) + 1023) / 1024) -#ifdef HAVE_MALLINFO +#ifdef HAVE_MALLINFO2 + if (1) { + struct mallinfo2 malloc_info = mallinfo2(); + + log_out(ctx, _("Memory used: %lluk/%lluk (%lluk/%lluk), "), + kbytes(malloc_info.arena), kbytes(malloc_info.hblkhd), + kbytes(malloc_info.uordblks), + kbytes(malloc_info.fordblks)); + } else +#elif defined HAVE_MALLINFO /* don't use mallinfo() if over 2GB used, since it returns "int" */ if ((char *)sbrk(0) - (char *)track->brk_start < 2LL << 30) { struct mallinfo malloc_info = mallinfo(); |