blktrace support: support for looking up a device

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index d8911ef5db8d19ef92804287a3f726cab0f82203..2717f5ddb80c447b94d8aa9fccbbc44314f1bed4 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -13,12 +13,14 @@
 #include <string.h>
 #include <getopt.h>
 
+#include "compiler/compiler.h"
 #include "list.h"
+#include "fifo.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
@@ -87,6 +89,7 @@ struct io_piece {
        unsigned long long offset;
        unsigned long len;
        enum fio_ddir ddir;
+       unsigned long delay;
 };
 
 #ifdef FIO_HAVE_SYSLET
@@ -134,6 +137,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
@@ -223,6 +227,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 {
@@ -235,13 +240,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 */
 };
 
 /*
@@ -264,6 +268,7 @@ struct fio_file {
         */
        char *file_name;
        void *mmap;
+       unsigned int major, minor;
 
        /*
         * size of the file, offset into file, and io size from that offset
@@ -330,6 +335,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];
@@ -388,7 +394,7 @@ struct thread_options {
        unsigned int thinktime_blocks;
        unsigned int fsync_blocks;
        unsigned int start_delay;
-       unsigned long timeout;
+       unsigned long long timeout;
        unsigned int overwrite;
        unsigned int bw_avg_time;
        unsigned int loops;
@@ -401,13 +407,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;
@@ -448,6 +455,7 @@ struct thread_data {
        struct fio_file *files;
        unsigned int files_index;
        unsigned int nr_open_files;
+       unsigned int nr_done_files;
        unsigned int nr_normal_files;
        union {
                unsigned int next_file;
@@ -516,6 +524,7 @@ struct thread_data {
        struct timeval start;   /* start of this loop */
        struct timeval epoch;   /* time job was started */
        struct timeval rw_end[2];
+       struct timeval last_issue;
        unsigned int rw_end_set[2];
 
        /*
@@ -645,8 +654,9 @@ struct disk_util {
        struct list_head list;
 
        char *name;
+       char *sysfs_root;
        char path[256];
-       dev_t dev;
+       int major, minor;
 
        struct disk_util_stat dus;
        struct disk_util_stat last_dus;
@@ -657,13 +667,6 @@ struct disk_util {
 
 #define DISK_UTIL_MSEC (250)
 
-#ifndef min
-#define min(a, b)      ((a) < (b) ? (a) : (b))
-#endif
-#ifndef max
-#define max(a, b)      ((a) > (b) ? (a) : (b))
-#endif
-
 /*
  * Log exports
  */
@@ -744,6 +747,21 @@ extern void dup_files(struct thread_data *, struct thread_data *);
 extern void print_thread_status(void);
 extern void print_status_init(int);
 
+/*
+ * disk util stuff
+ */
+#ifdef FIO_HAVE_DISK_UTIL
+extern void show_disk_util(void);
+extern void disk_util_timer_arm(void);
+extern void init_disk_util(struct thread_data *);
+extern void update_io_ticks(void);
+#else
+#define show_disk_util()
+#define disk_util_timer_arm()
+#define init_disk_util(td)
+#define update_io_ticks()
+#endif
+
 /*
  * Thread life cycle. Once a thread has a runstate beyond TD_INITIALIZED, it
  * will never back again. It may cycle between running/verififying/fsyncing.
@@ -804,6 +822,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
  */