AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 12:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update mallinfo2 ABI, and test

Browse Source 
This patch adds the ABI-related bits to reflect the new mallinfo2
function, and adds a test case to verify basic functionality.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
This commit is contained in:
DJ Delorie 2020-09-01 16:17:25 -04:00
parent d38e1bbda0
commit cdf645427d
38 changed files with 128 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NEWS
View File

@ -9,6 +9,10 @@ Version 2.33
Major new features:
* The mallinfo2 function is added to report statistics as per mallinfo,
but with larger field widths to accurately report values that are
larger than fit in an integer.
* Add <sys/platform/x86.h> to provide query macros for x86 CPU features.
* Support for the RISC-V ISA running on Linux has been expanded to run on
@ -23,7 +27,8 @@ Major new features:
Deprecated and removed features, and other changes affecting compatibility:
[Add deprecations, removals and changes affecting compatibility here]
* The mallinfo function is marked deprecated. Callers should call
mallinfo2 instead.
Changes to build and runtime requirements:

2
malloc/Makefile
View File

@ -35,7 +35,7 @@ tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \
tst-interpose-thread \
tst-alloc_buffer \
tst-malloc-tcache-leak \
tst-malloc_info \
tst-malloc_info tst-mallinfo2 \
tst-malloc-too-large \
tst-malloc-stats-cancellation \
tst-tcfree1 tst-tcfree2 tst-tcfree3 \

3
malloc/Versions
View File

@ -64,6 +64,9 @@ libc {
GLIBC_2.26 {
reallocarray;
}
GLIBC_2.33 {
mallinfo2;
}
GLIBC_PRIVATE {
# Internal startup hook for libpthread.
__libc_malloc_pthread_startup;

2
malloc/malloc.c
View File

@ -639,6 +639,7 @@ libc_hidden_proto (__libc_mallopt)
thus be inaccurate.
*/
struct mallinfo2 __libc_mallinfo2(void);
libc_hidden_proto (__libc_mallinfo2)
struct mallinfo __libc_mallinfo(void);
@ -4999,6 +5000,7 @@ __libc_mallinfo2 (void)
return m;
}
libc_hidden_def (__libc_mallinfo2)
struct mallinfo
__libc_mallinfo (void)

83
malloc/tst-mallinfo2.c Normal file
View File

@ -0,0 +1,83 @@
/* Smoke test for mallinfo2
Copyright (C) 2020 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
<https://www.gnu.org/licenses/>. */
/* Test that mallinfo2 is properly exported and basically works. */
#include <array_length.h>
#include <malloc.h>
#include <stdlib.h>
#include <support/check.h>
/* This is not specifically needed for the test, but (1) does
something to the data so gcc doesn't optimize it away, and (2) may
help when developing future tests. */
static void
print_mi (const char *msg, struct mallinfo2 *m)
{
printf("\n%s...\n", msg);
#define P(f) printf("%s: %zu\n", #f, m->f);
P(arena);
P(ordblks);
P(smblks);
P(hblks);
P(hblkhd);
P(usmblks);
P(fsmblks);
P(uordblks);
P(fordblks);
P(keepcost);
}
/* We do this to force the call to malloc to not be optimized
away. */
volatile void *ptr;
static int
do_test (void)
{
struct mallinfo2 mi1, mi2;
int i;
size_t total = 0;
/* This is the key difference between mallinfo() and mallinfo2().
It may be a false positive if int and size_t are the same
size. */
TEST_COMPARE (sizeof (mi1.arena), sizeof (size_t));
mi1 = mallinfo2 ();
print_mi ("before", &mi1);
/* Allocations that are meaningful-sized but not so large as to be
mmapped, so that they're all accounted for in the field we test
below. */
for (i = 1; i < 20; ++i)
{
ptr = malloc (160 * i);
total += 16 * i;
}
mi2 = mallinfo2 ();
print_mi ("after", &mi2);
/* Check at least something changed. */
TEST_VERIFY (mi2.uordblks > mi1.uordblks + total);
return 0;
}
#include <support/test-driver.c>

1
sysdeps/mach/hurd/i386/libc.abilist
View File

@ -2191,6 +2191,7 @@ GLIBC_2.32 thrd_current F
GLIBC_2.32 thrd_equal F
GLIBC_2.32 thrd_sleep F
GLIBC_2.32 thrd_yield F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 __confstr_chk F
GLIBC_2.4 __fgets_chk F
GLIBC_2.4 __fgets_unlocked_chk F

1
sysdeps/unix/sysv/linux/aarch64/libc.abilist
View File

@ -2160,3 +2160,4 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F

1
sysdeps/unix/sysv/linux/alpha/libc.abilist
View File

@ -2242,6 +2242,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 _IO_fprintf F
GLIBC_2.4 _IO_printf F
GLIBC_2.4 _IO_sprintf F

1
sysdeps/unix/sysv/linux/arc/libc.abilist
View File

@ -1920,3 +1920,4 @@ GLIBC_2.32 wprintf F
GLIBC_2.32 write F
GLIBC_2.32 writev F
GLIBC_2.32 wscanf F
GLIBC_2.33 mallinfo2 F

1
sysdeps/unix/sysv/linux/arm/be/libc.abilist
View File

@ -144,6 +144,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 _Exit F
GLIBC_2.4 _IO_2_1_stderr_ D 0xa0
GLIBC_2.4 _IO_2_1_stdin_ D 0xa0

1
sysdeps/unix/sysv/linux/arm/le/libc.abilist
View File

@ -141,6 +141,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 _Exit F
GLIBC_2.4 _IO_2_1_stderr_ D 0xa0
GLIBC_2.4 _IO_2_1_stdin_ D 0xa0

1
sysdeps/unix/sysv/linux/csky/libc.abilist
View File

@ -2104,3 +2104,4 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F

1
sysdeps/unix/sysv/linux/hppa/libc.abilist
View File

@ -2063,6 +2063,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 __confstr_chk F
GLIBC_2.4 __fgets_chk F
GLIBC_2.4 __fgets_unlocked_chk F

1
sysdeps/unix/sysv/linux/i386/libc.abilist
View File

@ -2229,6 +2229,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 __confstr_chk F
GLIBC_2.4 __fgets_chk F
GLIBC_2.4 __fgets_unlocked_chk F

1
sysdeps/unix/sysv/linux/ia64/libc.abilist
View File

@ -2095,6 +2095,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 __confstr_chk F
GLIBC_2.4 __fgets_chk F
GLIBC_2.4 __fgets_unlocked_chk F

1
sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
View File

@ -145,6 +145,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 _Exit F
GLIBC_2.4 _IO_2_1_stderr_ D 0x98
GLIBC_2.4 _IO_2_1_stdin_ D 0x98

1
sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
View File

@ -2175,6 +2175,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 __confstr_chk F
GLIBC_2.4 __fgets_chk F
GLIBC_2.4 __fgets_unlocked_chk F

1
sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
View File

@ -2155,3 +2155,4 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F

1
sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
View File

@ -2152,3 +2152,4 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F

1
sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
View File

@ -2146,6 +2146,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 __confstr_chk F
GLIBC_2.4 __fgets_chk F
GLIBC_2.4 __fgets_unlocked_chk F

1
sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
View File

@ -2144,6 +2144,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 __confstr_chk F
GLIBC_2.4 __fgets_chk F
GLIBC_2.4 __fgets_unlocked_chk F

1
sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
View File

@ -2152,6 +2152,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 __confstr_chk F
GLIBC_2.4 __fgets_chk F
GLIBC_2.4 __fgets_unlocked_chk F

1
sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
View File

@ -2146,6 +2146,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 __confstr_chk F
GLIBC_2.4 __fgets_chk F
GLIBC_2.4 __fgets_unlocked_chk F

1
sysdeps/unix/sysv/linux/nios2/libc.abilist
View File

@ -2193,3 +2193,4 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F

1
sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
View File

@ -2202,6 +2202,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 _IO_fprintf F
GLIBC_2.4 _IO_printf F
GLIBC_2.4 _IO_sprintf F

1
sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
View File

@ -2235,6 +2235,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 _IO_fprintf F
GLIBC_2.4 _IO_printf F
GLIBC_2.4 _IO_sprintf F

1
sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
View File

@ -2065,6 +2065,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 _IO_fprintf F
GLIBC_2.4 _IO_printf F
GLIBC_2.4 _IO_sprintf F

1
sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
View File

@ -2355,3 +2355,4 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F

1
sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
View File

@ -1168,6 +1168,7 @@ GLIBC_2.33 lutimes F
GLIBC_2.33 madvise F
GLIBC_2.33 makecontext F
GLIBC_2.33 mallinfo F
GLIBC_2.33 mallinfo2 F
GLIBC_2.33 malloc F
GLIBC_2.33 malloc_info F
GLIBC_2.33 malloc_stats F

1
sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
View File

@ -2122,3 +2122,4 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F

1
sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
View File

@ -2200,6 +2200,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 _IO_fprintf F
GLIBC_2.4 _IO_printf F
GLIBC_2.4 _IO_sprintf F

1
sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
View File

@ -2101,6 +2101,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 _IO_fprintf F
GLIBC_2.4 _IO_printf F
GLIBC_2.4 _IO_sprintf F

1
sysdeps/unix/sysv/linux/sh/be/libc.abilist
View File

@ -2070,6 +2070,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 __confstr_chk F
GLIBC_2.4 __fgets_chk F
GLIBC_2.4 __fgets_unlocked_chk F

1
sysdeps/unix/sysv/linux/sh/le/libc.abilist
View File

@ -2067,6 +2067,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 __confstr_chk F
GLIBC_2.4 __fgets_chk F
GLIBC_2.4 __fgets_unlocked_chk F

1
sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
View File

@ -2191,6 +2191,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 _IO_fprintf F
GLIBC_2.4 _IO_printf F
GLIBC_2.4 _IO_sprintf F

1
sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
View File

@ -2118,6 +2118,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 __confstr_chk F
GLIBC_2.4 __fgets_chk F
GLIBC_2.4 __fgets_unlocked_chk F

1
sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
View File

@ -2076,6 +2076,7 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F
GLIBC_2.4 __confstr_chk F
GLIBC_2.4 __fgets_chk F
GLIBC_2.4 __fgets_unlocked_chk F

1
sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
View File

@ -2173,3 +2173,4 @@ GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F
GLIBC_2.32 strerrorname_np F
GLIBC_2.33 mallinfo2 F