From 4789fb38f06c9bd8b6be7101e81e57a0e9766ea8 Mon Sep 17 00:00:00 2001 From: Michal Rakowski Date: Tue, 11 Jun 2019 09:10:16 +0200 Subject: [PATCH] Added asserts in sample env for synchronization functions Signed-off-by: Michal Rakowski --- env/posix/ocf_env.h | 26 +++++++++++++------------- src/ocf_stats.c | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/env/posix/ocf_env.h b/env/posix/ocf_env.h index 0d49e8b..64f568d 100644 --- a/env/posix/ocf_env.h +++ b/env/posix/ocf_env.h @@ -189,7 +189,7 @@ static inline int env_mutex_init(env_mutex *mutex) static inline void env_mutex_lock(env_mutex *mutex) { - pthread_mutex_lock(&mutex->m); + ENV_BUG_ON(pthread_mutex_lock(&mutex->m)); } static inline int env_mutex_lock_interruptible(env_mutex *mutex) @@ -205,7 +205,7 @@ static inline int env_mutex_trylock(env_mutex *mutex) static inline void env_mutex_unlock(env_mutex *mutex) { - pthread_mutex_unlock(&mutex->m); + ENV_BUG_ON(pthread_mutex_unlock(&mutex->m)); } static inline int env_mutex_is_locked(env_mutex *mutex) @@ -270,7 +270,7 @@ static inline void env_rwsem_up_read(env_rwsem *s) static inline void env_rwsem_down_read(env_rwsem *s) { - pthread_rwlock_rdlock(&s->lock); + ENV_BUG_ON(pthread_rwlock_rdlock(&s->lock)); } static inline int env_rwsem_down_read_trylock(env_rwsem *s) @@ -280,12 +280,12 @@ static inline int env_rwsem_down_read_trylock(env_rwsem *s) static inline void env_rwsem_up_write(env_rwsem *s) { - pthread_rwlock_unlock(&s->lock); + ENV_BUG_ON(pthread_rwlock_unlock(&s->lock)); } static inline void env_rwsem_down_write(env_rwsem *s) { - pthread_rwlock_wrlock(&s->lock); + ENV_BUG_ON(pthread_rwlock_wrlock(&s->lock)); } static inline int env_rwsem_down_write_trylock(env_rwsem *s) @@ -486,17 +486,17 @@ typedef struct { static inline void env_spinlock_init(env_spinlock *l) { - pthread_spin_init(&l->lock, 0); + ENV_BUG_ON(pthread_spin_init(&l->lock, 0)); } static inline void env_spinlock_lock(env_spinlock *l) { - pthread_spin_lock(&l->lock); + ENV_BUG_ON(pthread_spin_lock(&l->lock)); } static inline void env_spinlock_unlock(env_spinlock *l) { - pthread_spin_unlock(&l->lock); + ENV_BUG_ON(pthread_spin_unlock(&l->lock)); } static inline void env_spinlock_lock_irq(env_spinlock *l) @@ -525,27 +525,27 @@ typedef struct { static inline void env_rwlock_init(env_rwlock *l) { - pthread_rwlock_init(&l->lock, NULL); + ENV_BUG_ON(pthread_rwlock_init(&l->lock, NULL)); } static inline void env_rwlock_read_lock(env_rwlock *l) { - pthread_rwlock_rdlock(&l->lock); + ENV_BUG_ON(pthread_rwlock_rdlock(&l->lock)); } static inline void env_rwlock_read_unlock(env_rwlock *l) { - pthread_rwlock_unlock(&l->lock); + ENV_BUG_ON(pthread_rwlock_unlock(&l->lock)); } static inline void env_rwlock_write_lock(env_rwlock *l) { - pthread_rwlock_wrlock(&l->lock); + ENV_BUG_ON(pthread_rwlock_wrlock(&l->lock)); } static inline void env_rwlock_write_unlock(env_rwlock *l) { - pthread_rwlock_unlock(&l->lock); + ENV_BUG_ON(pthread_rwlock_unlock(&l->lock)); } /* *** WAITQUEUE *** */ diff --git a/src/ocf_stats.c b/src/ocf_stats.c index 1e6f76d..0cb49e0 100644 --- a/src/ocf_stats.c +++ b/src/ocf_stats.c @@ -172,7 +172,7 @@ int ocf_core_io_class_get_stats(ocf_core_t core, ocf_part_id_t part_id, OCF_CHECK_NULL(core); OCF_CHECK_NULL(stats); - if (part_id < OCF_IO_CLASS_ID_MIN || part_id > OCF_IO_CLASS_ID_MAX) + if (part_id > OCF_IO_CLASS_ID_MAX) return -OCF_ERR_INVAL; cache = ocf_core_get_cache(core);