Move nowarn_snprintf.h to lib/

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 0f6dfb6e6e8d93d8c35e97aaca5c5dd3d0c59044..6c897fc6fe9e9a4cad5473e1c0641305772a4136 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -27,6 +27,7 @@
 #include "ioengines.h"
 #include "iolog.h"
 #include "helpers.h"
+#include "minmax.h"
 #include "options.h"
 #include "profile.h"
 #include "fio_time.h"
@@ -43,6 +44,7 @@
 #include "io_u_queue.h"
 #include "workqueue.h"
 #include "steadystate.h"
+#include "lib/nowarn_snprintf.h"
 
 #ifdef CONFIG_SOLARISAIO
 #include <sys/asynch.h>
@@ -62,7 +64,7 @@
 #include <cuda.h>
 #endif
 
-struct fio_mutex;
+struct fio_sem;
 
 /*
  * offset generator types
@@ -78,7 +80,7 @@ enum {
        __TD_F_READ_IOLOG,
        __TD_F_REFILL_BUFFERS,
        __TD_F_SCRAMBLE_BUFFERS,
-       __TD_F_VER_NONE,
+       __TD_F_DO_VERIFY,
        __TD_F_PROFILE_OPS,
        __TD_F_COMPRESS,
        __TD_F_COMPRESS_LOG,
@@ -99,7 +101,7 @@ enum {
        TD_F_READ_IOLOG         = 1U << __TD_F_READ_IOLOG,
        TD_F_REFILL_BUFFERS     = 1U << __TD_F_REFILL_BUFFERS,
        TD_F_SCRAMBLE_BUFFERS   = 1U << __TD_F_SCRAMBLE_BUFFERS,
-       TD_F_VER_NONE           = 1U << __TD_F_VER_NONE,
+       TD_F_DO_VERIFY          = 1U << __TD_F_DO_VERIFY,
        TD_F_PROFILE_OPS        = 1U << __TD_F_PROFILE_OPS,
        TD_F_COMPRESS           = 1U << __TD_F_COMPRESS,
        TD_F_COMPRESS_LOG       = 1U << __TD_F_COMPRESS_LOG,
@@ -199,7 +201,7 @@ struct thread_data {
        struct timespec iops_sample_time;
 
        volatile int update_rusage;
-       struct fio_mutex *rusage_sem;
+       struct fio_sem *rusage_sem;
        struct rusage ru_start;
        struct rusage ru_end;
 
@@ -342,7 +344,7 @@ struct thread_data {
        uint64_t this_io_bytes[DDIR_RWDIR_CNT];
        uint64_t io_skip_bytes;
        uint64_t zone_bytes;
-       struct fio_mutex *mutex;
+       struct fio_sem *sem;
        uint64_t bytes_done[DDIR_RWDIR_CNT];
 
        /*
@@ -404,8 +406,6 @@ struct thread_data {
        struct flist_head trim_list;
        unsigned long trim_entries;
 
-       struct flist_head next_rand_list;
-
        /*
         * for fileservice, how often to switch to a new file
         */
@@ -469,7 +469,9 @@ enum {
                        break;                                          \
                (td)->error = ____e;                                    \
                if (!(td)->first_error)                                 \
-                       snprintf(td->verror, sizeof(td->verror), "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg));           \
+                       nowarn_snprintf(td->verror, sizeof(td->verror), \
+                                       "file:%s:%d, func=%s, error=%s", \
+                                       __FILE__, __LINE__, (func), (msg)); \
        } while (0)