Split mutex.c and .h each into three files

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index b3b95efb1b0ee23ad369efb2586bf87fa8edd1e0..0f6dfb6e6e8d93d8c35e97aaca5c5dd3d0c59044 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -20,7 +20,6 @@
 #include "fifo.h"
 #include "arch/arch.h"
 #include "os/os.h"
-#include "mutex.h"
 #include "log.h"
 #include "debug.h"
 #include "file.h"
@@ -63,6 +62,8 @@
 #include <cuda.h>
 #endif
 
+struct fio_mutex;
+
 /*
  * offset generator types
  */
@@ -228,9 +229,9 @@ struct thread_data {
        pid_t pid;
        char *orig_buffer;
        size_t orig_buffer_size;
-       volatile int terminate;
        volatile int runstate;
-       unsigned int last_was_sync;
+       volatile bool terminate;
+       bool last_was_sync;
        enum fio_ddir last_ddir;
 
        int mmapfd;
@@ -800,11 +801,6 @@ static inline void td_flags_set(struct thread_data *td, unsigned int *flags,
 extern const char *fio_get_arch_string(int);
 extern const char *fio_get_os_string(int);
 
-#ifdef FIO_INTERNAL
-#define ARRAY_SIZE(x)    (sizeof((x)) / (sizeof((x)[0])))
-#define FIELD_SIZE(s, f) (sizeof(((typeof(s))0)->f))
-#endif
-
 enum {
        __FIO_OUTPUT_TERSE      = 0,
        __FIO_OUTPUT_JSON       = 1,