diff options
Diffstat (limited to 'test/tsan/mutexset6.cc')
| -rw-r--r-- | test/tsan/mutexset6.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/tsan/mutexset6.cc b/test/tsan/mutexset6.cc index f4251db6970e8..ca349aaeee7a8 100644 --- a/test/tsan/mutexset6.cc +++ b/test/tsan/mutexset6.cc @@ -3,7 +3,7 @@ int Global; pthread_mutex_t mtx1; -pthread_spinlock_t mtx2; +pthread_mutex_t mtx2; pthread_rwlock_t mtx3; void *Thread1(void *x) { @@ -17,10 +17,10 @@ void *Thread1(void *x) { void *Thread2(void *x) { pthread_mutex_lock(&mtx1); pthread_mutex_unlock(&mtx1); - pthread_spin_lock(&mtx2); + pthread_mutex_lock(&mtx2); pthread_rwlock_rdlock(&mtx3); Global--; - pthread_spin_unlock(&mtx2); + pthread_mutex_unlock(&mtx2); pthread_rwlock_unlock(&mtx3); barrier_wait(&barrier); return NULL; @@ -34,13 +34,13 @@ int main() { // CHECK: Previous write of size 4 at {{.*}} by thread T2 // CHECK: (mutexes: write [[M2:M[0-9]+]], read [[M3:M[0-9]+]]): // CHECK: Mutex [[M1]] (0x{{.*}}) created at: - // CHECK: #1 main {{.*}}/mutexset6.cc:[[@LINE+5]] + // CHECK: #1 main {{.*}}mutexset6.cc:[[@LINE+5]] // CHECK: Mutex [[M2]] (0x{{.*}}) created at: - // CHECK: #1 main {{.*}}/mutexset6.cc:[[@LINE+4]] + // CHECK: #1 main {{.*}}mutexset6.cc:[[@LINE+4]] // CHECK: Mutex [[M3]] (0x{{.*}}) created at: - // CHECK: #1 main {{.*}}/mutexset6.cc:[[@LINE+3]] + // CHECK: #1 main {{.*}}mutexset6.cc:[[@LINE+3]] pthread_mutex_init(&mtx1, 0); - pthread_spin_init(&mtx2, 0); + pthread_mutex_init(&mtx2, 0); pthread_rwlock_init(&mtx3, 0); pthread_t t[2]; pthread_create(&t[0], NULL, Thread1, NULL); @@ -48,6 +48,6 @@ int main() { pthread_join(t[0], NULL); pthread_join(t[1], NULL); pthread_mutex_destroy(&mtx1); - pthread_spin_destroy(&mtx2); + pthread_mutex_destroy(&mtx2); pthread_rwlock_destroy(&mtx3); } |