OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

malloc: Various cleanups for malloc/tst-mxfast 

(cherry picked from commit f9769a239784772453d595bc2f4bed8739810e06)
This commit is contained in:
Florian Weimer 2019-08-15 11:37:18 +02:00 committed by Arjun Shankar
parent 4618f1ffba
commit 1b96d1d90b
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2019-08-15 Florian Weimer <fweimer@redhat.com>
* malloc/Makefile (tests): Only add tst-mxfast for
$(have-tunables).
* malloc/tst-mxfast.c: Fix copyright year.
(do_test): Fix GNU style issues. Use TEST_COMPARE instead of
assert for checks.
2019-08-09 DJ Delorie <dj@redhat.com> 2019-08-09 DJ Delorie <dj@redhat.com>
* elf/dl-tunables.list: Add glibc.malloc.mxfast. * elf/dl-tunables.list: Add glibc.malloc.mxfast.

3
malloc/Makefile
View File

@ -39,7 +39,6 @@ tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \
tst-malloc-too-large \ tst-malloc-too-large \
tst-malloc-stats-cancellation \ tst-malloc-stats-cancellation \
tst-tcfree1 tst-tcfree2 tst-tcfree3 \ tst-tcfree1 tst-tcfree2 tst-tcfree3 \
tst-mxfast \
tests-static := \ tests-static := \
tst-interpose-static-nothread \ tst-interpose-static-nothread \
@ -55,7 +54,7 @@ tests-internal += \
tst-dynarray-at-fail \ tst-dynarray-at-fail \
ifneq (no,$(have-tunables)) ifneq (no,$(have-tunables))
tests += tst-malloc-usable-tunables tests += tst-malloc-usable-tunables tst-mxfast
tests-static += tst-malloc-usable-static-tunables tests-static += tst-malloc-usable-static-tunables
endif endif

14
malloc/tst-mxfast.c
View File

@ -1,5 +1,5 @@
/* Test that glibc.malloc.mxfast tunable works. /* Test that glibc.malloc.mxfast tunable works.
Copyright (C) 2018, 2019 Free Software Foundation, Inc. Copyright (C) 2019 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -21,14 +21,14 @@
the fast bins. */ the fast bins. */
#include <malloc.h> #include <malloc.h>
#include <assert.h> #include <support/check.h>
int int
do_test(void) do_test (void)
{ {
struct mallinfo m; struct mallinfo m;
char * volatile p1; char *volatile p1;
char * volatile p2; char *volatile p2;
/* Arbitrary value; must be in default fastbin range. */ /* Arbitrary value; must be in default fastbin range. */
p1 = malloc (3); p1 = malloc (3);
@ -36,10 +36,10 @@ do_test(void)
p2 = malloc (512); p2 = malloc (512);
free (p1); free (p1);
m = mallinfo(); m = mallinfo ();
/* This will fail if there are any blocks in the fastbins. */ /* This will fail if there are any blocks in the fastbins. */
assert (m.smblks == 0); TEST_COMPARE (m.smblks, 0);
/* To keep gcc happy. */ /* To keep gcc happy. */
free (p2); free (p2);