aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-02-19 14:11:32 +0100
committerFlorian Weimer <fweimer@redhat.com>2016-02-19 14:12:56 +0100
commit2a38688932243b5b16fb12d84c7ac1138ce50363 (patch)
treea9ea300864172341dc1a64f6bbed865c05ed452d
parent3040149d43e9556e3fdea39470d1df951771ae41 (diff)
downloadglibc-2a38688932243b5b16fb12d84c7ac1138ce50363.tar
glibc-2a38688932243b5b16fb12d84c7ac1138ce50363.tar.gz
glibc-2a38688932243b5b16fb12d84c7ac1138ce50363.tar.bz2
glibc-2a38688932243b5b16fb12d84c7ac1138ce50363.zip
tst-malloc-thread-exit: Use fewer system resources
-rw-r--r--ChangeLog7
-rw-r--r--malloc/tst-malloc-thread-exit.c29
2 files changed, 22 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index ec2b50820a..bc7c5d374b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-02-19 Florian Weimer <fweimer@redhat.com>
+
+ * malloc/tst-malloc-thread-exit.c: Include test-skeleton.c early.
+ (do_test): Limit the number of arenas, so that we can use fewer
+ outer threads. Limit timeout to 3 seconds, in preparation for a
+ larger TIMEOUT value.
+
2016-02-19 Joseph Myers <joseph@codesourcery.com>
[BZ #19674]
diff --git a/malloc/tst-malloc-thread-exit.c b/malloc/tst-malloc-thread-exit.c
index f4aa21af86..fa6ebf98bf 100644
--- a/malloc/tst-malloc-thread-exit.c
+++ b/malloc/tst-malloc-thread-exit.c
@@ -26,13 +26,17 @@
particularly related to the arena free list. */
#include <errno.h>
+#include <malloc.h>
#include <pthread.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#define TIMEOUT 7
+static int do_test (void);
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
static bool termination_requested;
static int inner_thread_count = 4;
@@ -156,20 +160,20 @@ outer_thread (void *closure)
static int
do_test (void)
{
- /* The number of top-level threads should be equal to the number of
- arenas. See arena_get2. */
- long outer_thread_count = sysconf (_SC_NPROCESSORS_ONLN);
- if (outer_thread_count >= 1)
+ /* The number of threads should be smaller than the number of
+ arenas, so that there will be some free arenas to add to the
+ arena free list. */
+ enum { outer_thread_count = 2 };
+ if (mallopt (M_ARENA_MAX, 8) == 0)
{
- /* See NARENAS_FROM_NCORES in malloc.c. */
- if (sizeof (long) == 4)
- outer_thread_count *= 2;
- else
- outer_thread_count *= 8;
+ printf ("error: mallopt (M_ARENA_MAX) failed\n");
+ return 1;
}
/* Leave some room for shutting down all threads gracefully. */
- int timeout = TIMEOUT - 2;
+ int timeout = 3;
+ if (timeout > TIMEOUT)
+ timeout = TIMEOUT - 1;
pthread_t *threads = calloc (sizeof (*threads), outer_thread_count);
if (threads == NULL)
@@ -212,6 +216,3 @@ do_test (void)
return 0;
}
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"