mutex: make 0/1 FIO_MUTEX_LOCKED and FIO_MUTEX_UNLOCKED

Makes the API look cleaner.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/backend.c b/backend.c
index 9cc8dbc3ce1e029b4729e23e150428e4217b60e4..e41e8f1b41fffe64a8dc023523b48e482dd662d0 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -1620,7 +1620,7 @@ static int create_disk_util_thread(void)
 
        setup_disk_util();
 
 
        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) {
 
        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);
        }
 
                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;
        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;
 
        if (writeout_mutex == NULL)
                return 1;
 

diff --git a/cgroup.c b/cgroup.c
index ea6bbd69168d7578fcf5836f8d9267f05bc15448..86d4d5ea3b4331c1758561249b8583bce1e2ecc8 100644 (file)
--- a/cgroup.c
+++ b/cgroup.c
@@ -182,7 +182,7 @@ void cgroup_shutdown(struct thread_data *td, char **mnt)
 
 static void fio_init cgroup_init(void)
 {
 
 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)
 }
 
 static void fio_exit cgroup_exit(void)

diff --git a/diskutil.c b/diskutil.c
index f51d07b3c721345eb2fcc292a8137a71508ae94a..a3a5b4dd13d767a6430f0156589afcb27965c953 100644 (file)
--- a/diskutil.c
+++ b/diskutil.c
@@ -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->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);
        du->users = 0;
 
        fio_mutex_down(disk_util_mutex);


@@ -624,5 +624,5 @@ void show_disk_util(int terse)
 
 void setup_disk_util(void)
 {
 
 void setup_disk_util(void)
 {

-       disk_util_mutex = fio_mutex_init(1);
+       disk_util_mutex = fio_mutex_init(FIO_MUTEX_UNLOCKED);

 }
 }

diff --git a/filehash.c b/filehash.c
index 1bb1eb237606096a8d0bbec6b0ec583f34bafc00..392464e2ba61dd2f04caccba893ec5b0c17794cd 100644 (file)
--- a/filehash.c
+++ b/filehash.c
@@ -107,5 +107,5 @@ void file_hash_init(void *ptr)
        for (i = 0; i < HASH_BUCKETS; i++)
                INIT_FLIST_HEAD(&file_hash[i]);
 
        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 371b40589355848a0b2b63468cece91dcb7815dc..6277f0f40cd33d24f7ddd566f142ebb81f291d2e 100644 (file)
--- 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_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);
                break;
        default:
                log_err("fio: unknown lock mode: %d\n", td->o.file_lock_mode);

diff --git a/flow.c b/flow.c
index bf5eeec59c0acf2e06d0038ff438dab459d3b2ee..2993f4e8f8c48dbdc86ad25afc0653fcef31a481 100644 (file)
--- a/flow.c
+++ b/flow.c
@@ -92,7 +92,7 @@ void flow_exit_job(struct thread_data *td)
 
 void flow_init(void)
 {
 
 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);
 }
        flow_list = smalloc(sizeof(*flow_list));
        INIT_FLIST_HEAD(flow_list);
 }

diff --git a/gettime.c b/gettime.c
index e8f5ab55af38381e125a961407f876a82bcfb207..5b4928758b47f83c729082e399820ae2edc09a26 100644 (file)
--- a/gettime.c
+++ b/gettime.c
@@ -304,7 +304,7 @@ int fio_start_gtod_thread(void)
        pthread_attr_t attr;
        int ret;
 
        pthread_attr_t attr;
        int ret;
 

-       mutex = fio_mutex_init(0);
+       mutex = fio_mutex_init(FIO_MUTEX_LOCKED);

        if (!mutex)
                return 1;
 
        if (!mutex)
                return 1;
 

diff --git a/init.c b/init.c
index 3865d099c94c569771571323920b4598c7a79fcf..475a6ad29f69a87da2463f4e020609c5e99861b5 100644 (file)
--- a/init.c
+++ b/init.c
@@ -807,7 +807,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                        f->real_file_size = -1ULL;
        }
 
                        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)
 
        td->ts.clat_percentiles = td->o.clat_percentiles;
        if (td->o.overwrite_plist)

diff --git a/mutex.h b/mutex.h
index 5938e9592fb0505b5252587d936020717dcf4629..6fdf7c6dabceaa456d17f66040be3894c61556c8 100644 (file)
--- a/mutex.h
+++ b/mutex.h
@@ -10,6 +10,11 @@ struct fio_mutex {
        int waiters;
 };
 
        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 *);
 extern struct fio_mutex *fio_mutex_init(int);
 extern void fio_mutex_remove(struct fio_mutex *);
 extern void fio_mutex_down(struct fio_mutex *);

diff --git a/smalloc.c b/smalloc.c
index 5ba20047b37676ec8659dffc53dd6459061a5e4d..d0b6f1e1f0059fb266aac3334d078f36715fbacd 100644 (file)
--- a/smalloc.c
+++ b/smalloc.c
@@ -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->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;
 
        if (!pool->lock)
                goto out_fail;