Rename list_* function and file to flist_ to avoid conflict with FreeBSD

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index a155518160757bf16e3d9fb7210d51a4da4e130d..25318ae52511b90d513c8c387e52b488f2e92174 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -16,7 +16,7 @@
 #include <assert.h>
 
 #include "compiler/compiler.h"
-#include "list.h"
+#include "flist.h"
 #include "fifo.h"
 #include "rbtree.h"
 #include "arch/arch.h"
@@ -29,6 +29,10 @@
 #include <guasi.h>
 #endif
 
+#ifdef FIO_HAVE_SOLARISAIO
+#include <sys/asynch.h>
+#endif
+
 enum fio_ddir {
        DDIR_READ = 0,
        DDIR_WRITE,
@@ -88,7 +92,7 @@ struct io_log {
 struct io_piece {
        union {
                struct rb_node rb_node;
-               struct list_head list;
+               struct flist_head list;
        };
        union {
                int fileno;
@@ -126,6 +130,9 @@ struct io_u {
 #endif
 #ifdef FIO_HAVE_GUASI
                guasi_req_t greq;
+#endif
+#ifdef FIO_HAVE_SOLARISAIO
+               aio_result_t resultp;
 #endif
        };
        struct timeval start_time;
@@ -163,7 +170,7 @@ struct io_u {
 
        struct fio_file *file;
 
-       struct list_head list;
+       struct flist_head list;
 
        /*
         * Callback for io completion
@@ -288,7 +295,7 @@ enum fio_file_flags {
  * this structure holds state information for a single file.
  */
 struct fio_file {
-       struct list_head hash_list;
+       struct flist_head hash_list;
        enum fio_filetype filetype;
 
        /*
@@ -565,9 +572,9 @@ struct thread_data {
         */
        unsigned int cur_depth;
        unsigned int io_u_queued;
-       struct list_head io_u_freelist;
-       struct list_head io_u_busylist;
-       struct list_head io_u_requeues;
+       struct flist_head io_u_freelist;
+       struct flist_head io_u_busylist;
+       struct flist_head io_u_requeues;
 
        /*
         * Rate state
@@ -612,12 +619,12 @@ struct thread_data {
         * if we are overwriting. Otherwise just use a fifo.
         */
        struct rb_root io_hist_tree;
-       struct list_head io_hist_list;
+       struct flist_head io_hist_list;
 
        /*
         * For IO replaying
         */
-       struct list_head io_log_list;
+       struct flist_head io_log_list;
 
        /*
         * timeout handling
@@ -739,7 +746,7 @@ struct disk_util_stat {
  * Per-device disk util management
  */
 struct disk_util {
-       struct list_head list;
+       struct flist_head list;
 
        char *name;
        char *sysfs_root;
@@ -897,7 +904,7 @@ extern void free_io_mem(struct thread_data *);
 /*
  * io unit handling
  */
-#define queue_full(td) list_empty(&(td)->io_u_freelist)
+#define queue_full(td) flist_empty(&(td)->io_u_freelist)
 extern struct io_u *__get_io_u(struct thread_data *);
 extern struct io_u *get_io_u(struct thread_data *);
 extern void put_io_u(struct thread_data *, struct io_u *);
@@ -934,7 +941,7 @@ extern int load_blktrace(struct thread_data *, const char *);
 #endif
 
 struct ioengine_ops {
-       struct list_head list;
+       struct flist_head list;
        char name[16];
        int version;
        int flags;