diff options
author | Jens Axboe <axboe@kernel.dk> | 2012-08-02 11:21:36 +0200 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2012-08-02 11:21:36 +0200 |
commit | 521da527743088a9bd2ab882f8b64799d49d5848 (patch) | |
tree | 1844b18249229e13b3da133cc11552c29dd7cda8 | |
parent | 9ec7779f89d4dde9fe1e23d68abaefda54b35de7 (diff) | |
download | fio-521da527743088a9bd2ab882f8b64799d49d5848.tar.gz |
mutex: make 0/1 FIO_MUTEX_LOCKED and FIO_MUTEX_UNLOCKED
Makes the API look cleaner.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r-- | backend.c | 6 | ||||
-rw-r--r-- | cgroup.c | 2 | ||||
-rw-r--r-- | diskutil.c | 4 | ||||
-rw-r--r-- | filehash.c | 2 | ||||
-rw-r--r-- | filesetup.c | 2 | ||||
-rw-r--r-- | flow.c | 2 | ||||
-rw-r--r-- | gettime.c | 2 | ||||
-rw-r--r-- | init.c | 2 | ||||
-rw-r--r-- | mutex.h | 5 | ||||
-rw-r--r-- | smalloc.c | 2 |
10 files changed, 17 insertions, 12 deletions
@@ -1620,7 +1620,7 @@ static int create_disk_util_thread(void) setup_disk_util(); - disk_thread_mutex = fio_mutex_init(0); + disk_thread_mutex = fio_mutex_init(FIO_MUTEX_LOCKED); ret = pthread_create(&disk_util_thread, NULL, disk_thread_main, NULL); if (ret) { @@ -1661,10 +1661,10 @@ int fio_backend(void) setup_log(&agg_io_log[DDIR_WRITE], 0); } - startup_mutex = fio_mutex_init(0); + startup_mutex = fio_mutex_init(FIO_MUTEX_LOCKED); if (startup_mutex == NULL) return 1; - writeout_mutex = fio_mutex_init(1); + writeout_mutex = fio_mutex_init(FIO_MUTEX_UNLOCKED); if (writeout_mutex == NULL) return 1; @@ -182,7 +182,7 @@ void cgroup_shutdown(struct thread_data *td, char **mnt) static void fio_init cgroup_init(void) { - lock = fio_mutex_init(1); + lock = fio_mutex_init(FIO_MUTEX_UNLOCKED); } static void fio_exit cgroup_exit(void) @@ -290,7 +290,7 @@ static struct disk_util *disk_util_add(struct thread_data *td, int majdev, du->minor = mindev; INIT_FLIST_HEAD(&du->slavelist); INIT_FLIST_HEAD(&du->slaves); - du->lock = fio_mutex_init(1); + du->lock = fio_mutex_init(FIO_MUTEX_UNLOCKED); du->users = 0; fio_mutex_down(disk_util_mutex); @@ -624,5 +624,5 @@ void show_disk_util(int terse) void setup_disk_util(void) { - disk_util_mutex = fio_mutex_init(1); + disk_util_mutex = fio_mutex_init(FIO_MUTEX_UNLOCKED); } @@ -107,5 +107,5 @@ void file_hash_init(void *ptr) for (i = 0; i < HASH_BUCKETS; i++) INIT_FLIST_HEAD(&file_hash[i]); - hash_lock = fio_mutex_init(1); + hash_lock = fio_mutex_init(FIO_MUTEX_UNLOCKED); } diff --git a/filesetup.c b/filesetup.c index 371b4058..6277f0f4 100644 --- a/filesetup.c +++ b/filesetup.c @@ -1006,7 +1006,7 @@ int add_file(struct thread_data *td, const char *fname) f->lock = fio_mutex_rw_init(); break; case FILE_LOCK_EXCLUSIVE: - f->lock = fio_mutex_init(1); + f->lock = fio_mutex_init(FIO_MUTEX_UNLOCKED); break; default: log_err("fio: unknown lock mode: %d\n", td->o.file_lock_mode); @@ -92,7 +92,7 @@ void flow_exit_job(struct thread_data *td) void flow_init(void) { - flow_lock = fio_mutex_init(1); + flow_lock = fio_mutex_init(FIO_MUTEX_UNLOCKED); flow_list = smalloc(sizeof(*flow_list)); INIT_FLIST_HEAD(flow_list); } @@ -304,7 +304,7 @@ int fio_start_gtod_thread(void) pthread_attr_t attr; int ret; - mutex = fio_mutex_init(0); + mutex = fio_mutex_init(FIO_MUTEX_LOCKED); if (!mutex) return 1; @@ -807,7 +807,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) f->real_file_size = -1ULL; } - td->mutex = fio_mutex_init(0); + td->mutex = fio_mutex_init(FIO_MUTEX_LOCKED); td->ts.clat_percentiles = td->o.clat_percentiles; if (td->o.overwrite_plist) @@ -10,6 +10,11 @@ struct fio_mutex { int waiters; }; +enum { + FIO_MUTEX_LOCKED = 0, + FIO_MUTEX_UNLOCKED = 1, +}; + extern struct fio_mutex *fio_mutex_init(int); extern void fio_mutex_remove(struct fio_mutex *); extern void fio_mutex_down(struct fio_mutex *); @@ -206,7 +206,7 @@ static int add_pool(struct pool *pool, unsigned int alloc_size) pool->map = ptr; pool->bitmap = (void *) ptr + (pool->nr_blocks * SMALLOC_BPL); - pool->lock = fio_mutex_init(1); + pool->lock = fio_mutex_init(FIO_MUTEX_UNLOCKED); if (!pool->lock) goto out_fail; |