Switch last_was_sync and terminate to bool and pack better

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

diff --git a/fio.h b/fio.h
index 334f2036ac0b64646c6d30fdcc3085f0ce6099dd..85546c55c5e9b5999292ce0c7444b99c68eb6cb2 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -228,9 +228,9 @@ struct thread_data {
        pid_t pid;
        char *orig_buffer;
        size_t orig_buffer_size;
        pid_t pid;
        char *orig_buffer;
        size_t orig_buffer_size;

-       volatile int terminate;

        volatile int runstate;
        volatile int runstate;

-       unsigned int last_was_sync;
+       volatile bool terminate;
+       bool last_was_sync;

        enum fio_ddir last_ddir;
 
        int mmapfd;
        enum fio_ddir last_ddir;
 
        int mmapfd;

diff --git a/io_u.c b/io_u.c
index 6083eaa92eec4bfdfa485379367e92c458bb92cf..404c75b382ab5e187a23ea33134092e05b40f2a8 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -1994,7 +1994,7 @@ static void io_completed(struct thread_data *td, struct io_u **io_u_ptr,
        }
 
        if (ddir_sync(ddir)) {
        }
 
        if (ddir_sync(ddir)) {

-               td->last_was_sync = 1;
+               td->last_was_sync = true;

                if (f) {
                        f->first_write = -1ULL;
                        f->last_write = -1ULL;
                if (f) {
                        f->first_write = -1ULL;
                        f->last_write = -1ULL;


@@ -2004,7 +2004,7 @@ static void io_completed(struct thread_data *td, struct io_u **io_u_ptr,
                return;
        }
 
                return;
        }
 

-       td->last_was_sync = 0;
+       td->last_was_sync = false;

        td->last_ddir = ddir;
 
        if (!io_u->error && ddir_rw(ddir)) {
        td->last_ddir = ddir;
 
        if (!io_u->error && ddir_rw(ddir)) {

diff --git a/libfio.c b/libfio.c
index 74de7351a9a8244db061e5511d9f28d6bd826641..80159b4d0dbe1a1575550350727829cd7c6249a9 100644 (file)
--- a/libfio.c
+++ b/libfio.c
@@ -98,7 +98,7 @@ static void reset_io_counters(struct thread_data *td, int all)
 
        td->zone_bytes = 0;
 
 
        td->zone_bytes = 0;
 

-       td->last_was_sync = 0;
+       td->last_was_sync = false;

        td->rwmix_issues = 0;
 
        /*
        td->rwmix_issues = 0;
 
        /*


@@ -230,7 +230,7 @@ void fio_mark_td_terminate(struct thread_data *td)
 {
        fio_gettime(&td->terminate_time, NULL);
        write_barrier();
 {
        fio_gettime(&td->terminate_time, NULL);
        write_barrier();

-       td->terminate = 1;
+       td->terminate = true;

 }
 
 void fio_terminate_threads(unsigned int group_id)
 }
 
 void fio_terminate_threads(unsigned int group_id)