forked from rpms/glibc
2118accf25
Resolves: RHEL-45522
Fedora 40 commit: 9404e14f4d
Upstream commit: 4bdcc1963bc2b5ba5f8e319e402d9eb2cb6096c1
Fedora 40 changes:
- Backport /etc/resolv.conf enhancements to thelp with RHEL-18039 testing
Related: RHEL-50663
- Support --without testsuite builds without perl installed (#2292195)
- Use release instead of baserelease for glibc32 conflict
- Add Conflicts:/Obsoletes: for glibc32 to glibc.i686
- ppc64le: Build early startup code with -mcpu=power8
Resolves: RHEL-43456
- Move ANSI_X3.110-1983 support from main package to glibc-gconv-extra.
Resolves: RHEL-41206
Upstream changes:
- manual: make setrlimit() description less ambiguous
- manual/stdio: Clarify putc and putwc
- malloc: add multi-threaded tests for aligned_alloc/calloc/malloc
- malloc: avoid global locks in tst-aligned_alloc-lib.c
- resolv: Track single-request fallback via _res._flags (bug 31476)
- resolv: Do not wait for non-existing second DNS response after error (bug 30081)
- resolv: Allow short error responses to match any query (bug 31890)
Resolves: RHEL-50663
- elf: Fix localplt.awk for DT_RELR-enabled builds (BZ 31978)
- Fix usage of _STACK_GROWS_DOWN and _STACK_GROWS_UP defines [BZ 31989]
- Linux: Make __rseq_size useful for feature detection (bug 31965)
- elf: Make dl-rseq-symbols Linux only
- nptl: fix potential merge of __rseq_* relro symbols
- s390x: Fix segfault in wcsncmp [BZ #31934]
Resolves: RHEL-49488
- stdlib: fix arc4random fallback to /dev/urandom (BZ 31612)
- math: Provide missing math symbols on libc.a (BZ 31781)
- math: Fix isnanf128 static build (BZ 31774)
- math: Fix i386 and m68k exp10 on static build (BZ 31775)
- math: Fix i386 and m68k fmod/fmodf on static build (BZ 31488)
- posix: Fix pidfd_spawn/pidfd_spawnp leak if execve fails (BZ 31695)
89 lines
2.3 KiB
Diff
89 lines
2.3 KiB
Diff
commit f11b7178a12be4f26fef157cdee7bf6a944693d9
|
|
Author: Miguel Martín <mmartinv@redhat.com>
|
|
Date: Tue Jul 16 17:14:56 2024 +0200
|
|
|
|
malloc: avoid global locks in tst-aligned_alloc-lib.c
|
|
|
|
Make sure the DSO used by aligned_alloc/calloc/malloc tests does not get
|
|
a global lock on multithreaded tests.
|
|
Reviewed-by: Arjun Shankar <arjun@redhat.com>
|
|
|
|
(cherry picked from commit 9a27b566b2048f599048f2f4afe1cce06c4ef43d)
|
|
|
|
diff --git a/malloc/tst-aligned_alloc-lib.c b/malloc/tst-aligned_alloc-lib.c
|
|
index 0205df5acf6297a5..9ef1f839c101a6ae 100644
|
|
--- a/malloc/tst-aligned_alloc-lib.c
|
|
+++ b/malloc/tst-aligned_alloc-lib.c
|
|
@@ -17,37 +17,38 @@
|
|
License along with the GNU C Library; see the file COPYING.LIB. If
|
|
not, see <https://www.gnu.org/licenses/>. */
|
|
|
|
-#include <array_length.h>
|
|
#include <libc-symbols.h>
|
|
#include <stdlib.h>
|
|
+#include <time.h>
|
|
|
|
extern void *__libc_malloc (size_t size);
|
|
extern void *__libc_calloc (size_t n, size_t size);
|
|
|
|
+__thread unsigned int seed = 0;
|
|
+
|
|
int aligned_alloc_count = 0;
|
|
int libc_malloc_count = 0;
|
|
int libc_calloc_count = 0;
|
|
|
|
-/* Get a random alignment value. Biased towards the smaller values. Must be
|
|
- a power of 2. */
|
|
-static size_t get_random_alignment (void)
|
|
-{
|
|
- size_t aligns[] = {
|
|
- 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384
|
|
- };
|
|
-
|
|
- return aligns[random () % array_length (aligns)];
|
|
-}
|
|
-
|
|
-static void *get_random_alloc (size_t size)
|
|
+static void *
|
|
+get_random_alloc (size_t size)
|
|
{
|
|
void *retval;
|
|
size_t align;
|
|
+ struct timespec tp;
|
|
+
|
|
+ if (seed == 0)
|
|
+ {
|
|
+ clock_gettime (CLOCK_REALTIME, &tp);
|
|
+ seed = tp.tv_nsec;
|
|
+ }
|
|
|
|
- switch (random() % 3)
|
|
- {
|
|
+ switch (rand_r (&seed) % 3)
|
|
+ {
|
|
case 1:
|
|
- align = get_random_alignment ();
|
|
+ /* Get a random alignment value. Biased towards the smaller
|
|
+ * values up to 16384. Must be a power of 2. */
|
|
+ align = 1 << rand_r (&seed) % 15;
|
|
retval = aligned_alloc (align, size);
|
|
aligned_alloc_count++;
|
|
break;
|
|
@@ -59,13 +60,13 @@ static void *get_random_alloc (size_t size)
|
|
retval = __libc_malloc (size);
|
|
libc_malloc_count++;
|
|
break;
|
|
- }
|
|
+ }
|
|
|
|
return retval;
|
|
}
|
|
|
|
-
|
|
-void * __random_malloc (size_t size)
|
|
+void *
|
|
+__random_malloc (size_t size)
|
|
{
|
|
return get_random_alloc (size);
|
|
}
|