From a8e736a8486f177ebca6e570eed392b85392d705 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 22 Jul 2013 15:24:36 -0700 Subject: [PATCH] ovs-thread: Add wrappers for "destroy" functions too. Signed-off-by: Ben Pfaff Acked-by: Ethan Jackson --- lib/ovs-thread.c | 3 +++ lib/ovs-thread.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/lib/ovs-thread.c b/lib/ovs-thread.c index 47765876b..91bb3d958 100644 --- a/lib/ovs-thread.c +++ b/lib/ovs-thread.c @@ -73,6 +73,7 @@ static bool multithreaded; } XPTHREAD_FUNC2(pthread_mutex_init, pthread_mutex_t *, pthread_mutexattr_t *); +XPTHREAD_FUNC1(pthread_mutex_destroy, pthread_mutex_t *); XPTHREAD_FUNC1(pthread_mutex_lock, pthread_mutex_t *); XPTHREAD_FUNC1(pthread_mutex_unlock, pthread_mutex_t *); XPTHREAD_TRY_FUNC1(pthread_mutex_trylock, pthread_mutex_t *); @@ -84,6 +85,7 @@ XPTHREAD_FUNC2(pthread_mutexattr_gettype, pthread_mutexattr_t *, int *); XPTHREAD_FUNC2(pthread_rwlock_init, pthread_rwlock_t *, pthread_rwlockattr_t *); +XPTHREAD_FUNC1(pthread_rwlock_destroy, pthread_rwlock_t *); XPTHREAD_FUNC1(pthread_rwlock_rdlock, pthread_rwlock_t *); XPTHREAD_FUNC1(pthread_rwlock_wrlock, pthread_rwlock_t *); XPTHREAD_FUNC1(pthread_rwlock_unlock, pthread_rwlock_t *); @@ -91,6 +93,7 @@ XPTHREAD_TRY_FUNC1(pthread_rwlock_tryrdlock, pthread_rwlock_t *); XPTHREAD_TRY_FUNC1(pthread_rwlock_trywrlock, pthread_rwlock_t *); XPTHREAD_FUNC2(pthread_cond_init, pthread_cond_t *, pthread_condattr_t *); +XPTHREAD_FUNC1(pthread_cond_destroy, pthread_cond_t *); XPTHREAD_FUNC1(pthread_cond_signal, pthread_cond_t *); XPTHREAD_FUNC1(pthread_cond_broadcast, pthread_cond_t *); XPTHREAD_FUNC2(pthread_cond_wait, pthread_cond_t *, pthread_mutex_t *); diff --git a/lib/ovs-thread.h b/lib/ovs-thread.h index b18447d8e..29a8637a5 100644 --- a/lib/ovs-thread.h +++ b/lib/ovs-thread.h @@ -58,6 +58,7 @@ * abort on any other error. */ void xpthread_mutex_init(pthread_mutex_t *, pthread_mutexattr_t *); +void xpthread_mutex_destroy(pthread_mutex_t *); void xpthread_mutex_lock(pthread_mutex_t *mutex) OVS_ACQUIRES(mutex); void xpthread_mutex_unlock(pthread_mutex_t *mutex) OVS_RELEASES(mutex); int xpthread_mutex_trylock(pthread_mutex_t *); @@ -68,6 +69,7 @@ void xpthread_mutexattr_settype(pthread_mutexattr_t *, int type); void xpthread_mutexattr_gettype(pthread_mutexattr_t *, int *typep); void xpthread_rwlock_init(pthread_rwlock_t *, pthread_rwlockattr_t *); +void xpthread_rwlock_destroy(pthread_rwlock_t *); void xpthread_rwlock_rdlock(pthread_rwlock_t *rwlock) OVS_ACQUIRES(rwlock); void xpthread_rwlock_wrlock(pthread_rwlock_t *rwlock) OVS_ACQUIRES(rwlock); void xpthread_rwlock_unlock(pthread_rwlock_t *rwlock) OVS_RELEASES(rwlock); @@ -75,6 +77,7 @@ int xpthread_rwlock_tryrdlock(pthread_rwlock_t *); int xpthread_rwlock_trywrlock(pthread_rwlock_t *); void xpthread_cond_init(pthread_cond_t *, pthread_condattr_t *); +void xpthread_cond_destroy(pthread_cond_t *); void xpthread_cond_signal(pthread_cond_t *); void xpthread_cond_broadcast(pthread_cond_t *); void xpthread_cond_wait(pthread_cond_t *, pthread_mutex_t *mutex) -- 2.43.0