From ec68790f6d522aae2a3d5d97f1974915a76e23cf Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 24 Jun 2013 11:05:10 -0700 Subject: ovs-thread: New module, initially just with pthreads wrapper functions. The only tricky part here is that I'm throwing in annotations to allow "sparse" to report unbalanced locking. Signed-off-by: Ben Pfaff Acked-by: Ethan Jackson --- include/sparse/automake.mk | 1 + include/sparse/pthread.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 include/sparse/pthread.h (limited to 'include/sparse') diff --git a/include/sparse/automake.mk b/include/sparse/automake.mk index 1a77500b9..45ae1f506 100644 --- a/include/sparse/automake.mk +++ b/include/sparse/automake.mk @@ -4,5 +4,6 @@ noinst_HEADERS += \ include/sparse/math.h \ include/sparse/netinet/in.h \ include/sparse/netinet/ip6.h \ + include/sparse/pthread.h \ include/sparse/sys/socket.h \ include/sparse/sys/wait.h diff --git a/include/sparse/pthread.h b/include/sparse/pthread.h new file mode 100644 index 000000000..7ba6a05ab --- /dev/null +++ b/include/sparse/pthread.h @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2013 Nicira, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __CHECKER__ +#error "Use this header only with sparse. It is not a correct implementation." +#endif + +/* Get actual definitions for us to annotate and build on. */ +#include_next + +#include "compiler.h" + +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_unlock(pthread_rwlock_t *rwlock) OVS_RELEASES(rwlock); + +int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *mutex) + OVS_MUST_HOLD(mutex); + +#define pthread_mutex_trylock(MUTEX) \ + ({ \ + int retval = pthread_mutex_trylock(mutex); \ + if (!retval) { \ + OVS_ACQUIRE(MUTEX); \ + } \ + retval; \ + }) + +#define pthread_rwlock_tryrdlock(RWLOCK) \ + ({ \ + int retval = pthread_rwlock_tryrdlock(rwlock); \ + if (!retval) { \ + OVS_ACQUIRE(RWLOCK); \ + } \ + retval; \ + }) +#define pthread_rwlock_trywrlock(RWLOCK) \ + ({ \ + int retval = pthread_rwlock_trywrlock(rwlock); \ + if (!retval) { \ + OVS_ACQUIRE(RWLOCK); \ + } \ + retval; \ + }) -- cgit v1.2.1