diff options
Diffstat (limited to 'include/sparse/pthread.h')
| -rw-r--r-- | include/sparse/pthread.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/sparse/pthread.h b/include/sparse/pthread.h index 6cdf5c8a7..aa4652efc 100644 --- a/include/sparse/pthread.h +++ b/include/sparse/pthread.h @@ -26,12 +26,12 @@ int pthread_mutex_lock(pthread_mutex_t *mutex) OVS_ACQUIRES(mutex); int pthread_mutex_unlock(pthread_mutex_t *mutex) OVS_RELEASES(mutex); -int pthread_rwlock_rdlock(pthread_rwlock_t *rwlock) OVS_ACQUIRES(rwlock); -int pthread_rwlock_wrlock(pthread_rwlock_t *rwlock) OVS_ACQUIRES(rwlock); +int pthread_rwlock_rdlock(pthread_rwlock_t *rwlock) OVS_ACQ_RDLOCK(rwlock); +int pthread_rwlock_wrlock(pthread_rwlock_t *rwlock) OVS_ACQ_WRLOCK(rwlock); int pthread_rwlock_unlock(pthread_rwlock_t *rwlock) OVS_RELEASES(rwlock); int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *mutex) - OVS_MUST_HOLD(mutex); + OVS_REQUIRES(mutex); /* Sparse complains about the proper PTHREAD_*_INITIALIZER definitions. * Luckily, it's not a real compiler so we can overwrite it with something @@ -52,7 +52,7 @@ int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *mutex) ({ \ int retval = pthread_mutex_trylock(mutex); \ if (!retval) { \ - OVS_ACQUIRE(MUTEX); \ + OVS_MACRO_LOCK(MUTEX); \ } \ retval; \ }) @@ -61,7 +61,7 @@ int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *mutex) ({ \ int retval = pthread_rwlock_tryrdlock(rwlock); \ if (!retval) { \ - OVS_ACQUIRE(RWLOCK); \ + OVS_MACRO_LOCK(RWLOCK); \ } \ retval; \ }) @@ -69,7 +69,7 @@ int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *mutex) ({ \ int retval = pthread_rwlock_trywrlock(rwlock); \ if (!retval) { \ - OVS_ACQUIRE(RWLOCK); \ + OVS_MACRO_LOCK(RWLOCK); \ } \ retval; \ }) |