blktrace support update

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index a62971d1637d88f09da136d92ed1ee3909944b14..870b6704a7852a938d47830e85f5753165d45de1 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -13,13 +13,13 @@
 #include <string.h>
 #include <getopt.h>
 
-#include "compiler.h"
+#include "compiler/compiler.h"
 #include "list.h"
 #include "rbtree.h"
 #include "md5.h"
 #include "crc32.h"
-#include "arch.h"
-#include "os.h"
+#include "arch/arch.h"
+#include "os/os.h"
 #include "mutex.h"
 
 #ifdef FIO_HAVE_SYSLET
@@ -88,6 +88,7 @@ struct io_piece {
        unsigned long long offset;
        unsigned long len;
        enum fio_ddir ddir;
+       unsigned long delay;
 };
 
 #ifdef FIO_HAVE_SYSLET
@@ -135,6 +136,7 @@ struct io_u {
        void *buf;
        unsigned long buflen;
        unsigned long long offset;
+       unsigned long long endpos;
 
        /*
         * IO engine state, may be different from above when we get
@@ -224,6 +226,7 @@ enum fio_filetype {
        FIO_TYPE_FILE = 1,              /* plain file */
        FIO_TYPE_BD,                    /* block device */
        FIO_TYPE_CHAR,                  /* character device */
+       FIO_TYPE_PIPE,                  /* pipe */
 };
 
 enum fio_ioengine_flags {
@@ -236,13 +239,12 @@ enum fio_ioengine_flags {
 
 enum fio_file_flags {
        FIO_FILE_OPEN           = 1 << 0,       /* file is open */
-       FIO_FILE_UNLINK         = 1 << 1,       /* unlink on close */
-       FIO_FILE_CLOSING        = 1 << 2,       /* file being closed */
-       FIO_FILE_EXISTS         = 1 << 3,       /* file there */
-       FIO_FILE_EXTEND         = 1 << 4,       /* needs extend */
-       FIO_FILE_NOSORT         = 1 << 5,       /* don't sort verify blocks */
-       FIO_FILE_DONE           = 1 << 6,       /* io completed to this file */
-       FIO_SIZE_KNOWN          = 1 << 7,       /* size has been set */
+       FIO_FILE_CLOSING        = 1 << 1,       /* file being closed */
+       FIO_FILE_EXISTS         = 1 << 2,       /* file there */
+       FIO_FILE_EXTEND         = 1 << 3,       /* needs extend */
+       FIO_FILE_NOSORT         = 1 << 4,       /* don't sort verify blocks */
+       FIO_FILE_DONE           = 1 << 5,       /* io completed to this file */
+       FIO_SIZE_KNOWN          = 1 << 6,       /* size has been set */
 };
 
 /*
@@ -331,6 +333,7 @@ struct thread_stat {
        unsigned int io_u_map[FIO_IO_U_MAP_NR];
        unsigned int io_u_lat[FIO_IO_U_LAT_NR];
        unsigned long total_io_u[2];
+       unsigned long short_io_u[2];
 
        unsigned long long io_bytes[2];
        unsigned long runtime[2];
@@ -402,13 +405,14 @@ struct thread_options {
        unsigned int numjobs;
        os_cpu_mask_t cpumask;
        unsigned int iolog;
-       unsigned int read_iolog;
        unsigned int rwmixcycle;
        unsigned int rwmix[2];
        unsigned int nice;
        unsigned int file_service_type;
        unsigned int group_reporting;
        unsigned int fadvise_hint;
+       unsigned int zero_buffers;
+       unsigned int time_based;
 
        char *read_iolog_file;
        char *write_iolog_file;
@@ -647,6 +651,7 @@ struct disk_util {
        struct list_head list;
 
        char *name;
+       char *sysfs_root;
        char path[256];
        int major, minor;
 
@@ -821,6 +826,12 @@ extern int __must_check td_io_commit(struct thread_data *);
 extern int __must_check td_io_open_file(struct thread_data *, struct fio_file *);
 extern void td_io_close_file(struct thread_data *, struct fio_file *);
 
+/*
+ * blktrace support
+ */
+extern int is_blktrace(const char *);
+extern int load_blktrace(struct thread_data *, const char *);
+
 /*
  * If logging output to a file, stderr should go to both stderr and f_err
  */