diff options
| author | Ben Pfaff <blp@nicira.com> | 2013-06-24 11:05:10 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2013-06-25 14:05:01 -0700 |
| commit | ec68790f6d522aae2a3d5d97f1974915a76e23cf (patch) | |
| tree | 204939acd595431fa2d6ab9c8bd9df9907f52515 /include/sparse | |
| parent | 1c3e353dbd10241ced4a04a5da655364704388ba (diff) | |
| download | openvswitch-ec68790f6d522aae2a3d5d97f1974915a76e23cf.tar.gz | |
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 <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
Diffstat (limited to 'include/sparse')
| -rw-r--r-- | include/sparse/automake.mk | 1 | ||||
| -rw-r--r-- | include/sparse/pthread.h | 60 |
2 files changed, 61 insertions, 0 deletions
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 <pthread.h> definitions for us to annotate and build on. */ +#include_next <pthread.h> + +#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; \ + }) |