From: Jens Axboe Date: Tue, 1 Dec 2015 16:08:47 +0000 (-0700) Subject: mutex: use bool X-Git-Tag: fio-2.2.13~55 X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=66608372288ecfe94abbc4b12a89b5c18071897f mutex: use bool Signed-off-by: Jens Axboe --- diff --git a/mutex.c b/mutex.c index 53f9651a..7612b32b 100644 --- a/mutex.c +++ b/mutex.c @@ -92,7 +92,7 @@ struct fio_mutex *fio_mutex_init(int value) return NULL; } -static int mutex_timed_out(struct timeval *t, unsigned int seconds) +static bool mutex_timed_out(struct timeval *t, unsigned int seconds) { return mtime_since_now(t) >= seconds * 1000; } @@ -133,16 +133,16 @@ int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds) return ret; } -int fio_mutex_down_trylock(struct fio_mutex *mutex) +bool fio_mutex_down_trylock(struct fio_mutex *mutex) { - int ret = 1; + bool ret = true; assert(mutex->magic == FIO_MUTEX_MAGIC); pthread_mutex_lock(&mutex->lock); if (mutex->value) { mutex->value--; - ret = 0; + ret = false; } pthread_mutex_unlock(&mutex->lock); diff --git a/mutex.h b/mutex.h index 17380de2..8c1a7111 100644 --- a/mutex.h +++ b/mutex.h @@ -2,6 +2,7 @@ #define FIO_MUTEX_H #include +#include "lib/types.h" #define FIO_MUTEX_MAGIC 0x4d555445U #define FIO_RWLOCK_MAGIC 0x52574c4fU @@ -30,7 +31,7 @@ extern void __fio_mutex_remove(struct fio_mutex *); extern void fio_mutex_remove(struct fio_mutex *); extern void fio_mutex_up(struct fio_mutex *); extern void fio_mutex_down(struct fio_mutex *); -extern int fio_mutex_down_trylock(struct fio_mutex *); +extern bool fio_mutex_down_trylock(struct fio_mutex *); extern int fio_mutex_down_timeout(struct fio_mutex *, unsigned int); extern void fio_rwlock_read(struct fio_rwlock *);