[PATCH] Split up fio.c into log/stat/time parts

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index e997fbe52f3c6ae900a5909f8c1bd44452f4b26d..58fabbdb1fbcd8221bef66abcc33efb33fce1721 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -7,6 +7,9 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <semaphore.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
 
 #include "list.h"
 #include "md5.h"
@@ -94,13 +97,13 @@ struct verify_header {
 struct group_run_stats {
        unsigned long long max_run[2], min_run[2];
        unsigned long long max_bw[2], min_bw[2];
-       unsigned long long io_mb[2];
+       unsigned long long io_kb[2];
        unsigned long long agg[2];
 };
 
 struct thread_data {
        char file_name[256];
-       char directory[256];
+       char *directory;
        char verror[80];
        pthread_t thread;
        int thread_number;
@@ -134,6 +137,7 @@ struct thread_data {
        unsigned int bw_avg_time;
        unsigned int create_serialize;
        unsigned int create_fsync;
+       unsigned int end_fsync;
        unsigned int loops;
        unsigned long long file_size;
        unsigned long long real_file_size;
@@ -150,8 +154,19 @@ struct thread_data {
        os_cpu_mask_t cpumask;
        unsigned int jobnum;
        unsigned int iolog;
+       unsigned int read_iolog;
+       unsigned int write_iolog;
+       unsigned int rwmixcycle;
+       unsigned int rwmixread;
+       unsigned int nice;
 
-       char iolog_file[256];
+       char *iolog_file;
+       void *iolog_buf;
+       FILE *iolog_f;
+
+       char *sysfs_root;
+
+       char *ioscheduler;
 
        struct drand48_data bsrange_state;
        struct drand48_data verify_state;
@@ -221,6 +236,16 @@ struct thread_data {
        unsigned int do_disk_util;
        unsigned int override_sync;
 
+       struct drand48_data rwmix_state;
+       struct timeval rwmix_switch;
+       int rwmix_ddir;
+
+       /*
+        * Pre-run and post-run shell
+        */
+       char *exec_prerun;
+       char *exec_postrun;
+
        struct list_head io_hist_list;
        struct list_head io_log_list;
 };
@@ -278,6 +303,7 @@ enum {
        FIO_LIBAIO      = 1 << 2,
        FIO_POSIXAIO    = 1 << 3,
        FIO_SGIO        = 1 << 4,
+       FIO_SPLICEIO    = 1 << 5 | FIO_SYNCIO,
 };
 
 #define td_read(td)            ((td)->ddir == DDIR_READ)