diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/tst-cond16.c | 7 | ||||
| -rw-r--r-- | nptl/tst-cond18.c | 8 |
3 files changed, 9 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index addc36ae88..e057487e93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-08-30 Florian Weimer <fweimer@redhat.com> + + Do not scale NPTL tests with available number of CPUs. + * nptl/tst-cond16.c (count): Set to constant value of 8. + * nptl/tst-cond18.c (count): Likewise. + 2017-08-29 Joseph Myers <joseph@codesourcery.com> [BZ #22035] diff --git a/nptl/tst-cond16.c b/nptl/tst-cond16.c index 032677adcc..b3bfb90bd4 100644 --- a/nptl/tst-cond16.c +++ b/nptl/tst-cond16.c @@ -28,7 +28,7 @@ pthread_cond_t cv = PTHREAD_COND_INITIALIZER; pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; bool n, exiting; FILE *f; -int count; +enum { count = 8 }; /* Number of worker threads. */ void * tf (void *dummy) @@ -71,11 +71,6 @@ do_test (void) return 1; } - count = sysconf (_SC_NPROCESSORS_ONLN); - if (count <= 0) - count = 1; - count *= 4; - pthread_t th[count]; pthread_attr_t attr; int i, ret, sz; diff --git a/nptl/tst-cond18.c b/nptl/tst-cond18.c index 187f3af1df..6276110ec2 100644 --- a/nptl/tst-cond18.c +++ b/nptl/tst-cond18.c @@ -28,7 +28,8 @@ pthread_cond_t cv = PTHREAD_COND_INITIALIZER; pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; bool exiting; -int fd, count, spins, nn; +int fd, spins, nn; +enum { count = 8 }; /* Number of worker threads. */ void * tf (void *id) @@ -82,11 +83,6 @@ do_test (void) return 1; } - count = sysconf (_SC_NPROCESSORS_ONLN); - if (count <= 0) - count = 1; - count *= 8; - pthread_t th[count + 1]; pthread_attr_t attr; int i, ret, sz; |