diff options
| author | Andi Kleen <ak@linux.intel.com> | 2013-06-28 05:19:37 -0700 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2013-07-02 08:46:54 -0700 |
| commit | 68cc29355f3334c7ad18f648ff9a6383a0916d23 (patch) | |
| tree | 357381e30be0b3dedfafe7a220714e20aad6ad73 /nptl/tst-mutex8.c | |
| parent | b023e4ca99f5e81f90d87d23cd267ef2abd2388c (diff) | |
Add minimal test suite changes for elision enabled kernels
tst-mutex5 and 8 test some behaviour not required by POSIX,
that elision changes. This changes these tests to not check
this when elision is enabled at configure time.
Diffstat (limited to 'nptl/tst-mutex8.c')
| -rw-r--r-- | nptl/tst-mutex8.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/nptl/tst-mutex8.c b/nptl/tst-mutex8.c index 2089c50d4e..d2307e47e7 100644 --- a/nptl/tst-mutex8.c +++ b/nptl/tst-mutex8.c @@ -93,6 +93,8 @@ tf (void *arg) static int check_type (const char *mas, pthread_mutexattr_t *ma) { + int e __attribute__((unused)); + if (pthread_mutex_init (m, ma) != 0) { printf ("1st mutex_init failed for %s\n", mas); @@ -117,7 +119,10 @@ check_type (const char *mas, pthread_mutexattr_t *ma) return 1; } - int e = pthread_mutex_destroy (m); + /* Elided mutexes don't fail destroy. If elision is not explicitly disabled + we don't know, so can also not check this. */ +#ifndef ENABLE_LOCK_ELISION + e = pthread_mutex_destroy (m); if (e == 0) { printf ("mutex_destroy of self-locked mutex succeeded for %s\n", mas); @@ -129,6 +134,7 @@ check_type (const char *mas, pthread_mutexattr_t *ma) mas); return 1; } +#endif if (pthread_mutex_unlock (m) != 0) { @@ -142,6 +148,8 @@ check_type (const char *mas, pthread_mutexattr_t *ma) return 1; } + /* Elided mutexes don't fail destroy. */ +#ifndef ENABLE_LOCK_ELISION e = pthread_mutex_destroy (m); if (e == 0) { @@ -155,6 +163,7 @@ mutex_destroy of self-trylocked mutex did not return EBUSY %s\n", mas); return 1; } +#endif if (pthread_mutex_unlock (m) != 0) { @@ -189,6 +198,8 @@ mutex_destroy of self-trylocked mutex did not return EBUSY %s\n", return 1; } + /* Elided mutexes don't fail destroy. */ +#ifndef ENABLE_LOCK_ELISION e = pthread_mutex_destroy (m); if (e == 0) { @@ -201,6 +212,7 @@ mutex_destroy of self-trylocked mutex did not return EBUSY %s\n", mutex_destroy of condvar-used mutex did not return EBUSY for %s\n", mas); return 1; } +#endif done = true; if (pthread_cond_signal (&c) != 0) @@ -259,6 +271,8 @@ mutex_destroy of condvar-used mutex did not return EBUSY for %s\n", mas); return 1; } + /* Elided mutexes don't fail destroy. */ +#ifndef ENABLE_LOCK_ELISION e = pthread_mutex_destroy (m); if (e == 0) { @@ -273,6 +287,7 @@ mutex_destroy of condvar-used mutex did not return EBUSY for %s\n", mas); mas); return 1; } +#endif if (pthread_cancel (th) != 0) { |