Merge branch 'master' of ssh://git.kernel.dk/data/git/fio

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 50cf1b03f3956985d9244a32330969ae57ff12c1..0fb86eaed442324832700d61b70d7123bbecc482 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -235,7 +235,16 @@ struct thread_data {
        uint64_t total_io_size;
        uint64_t fill_device_size;
 
+       /*
+        * Issue side
+        */
        uint64_t io_issues[DDIR_RWDIR_CNT];
+       uint64_t io_issue_bytes[DDIR_RWDIR_CNT];
+       uint64_t loops;
+
+       /*
+        * Completions
+        */
        uint64_t io_blocks[DDIR_RWDIR_CNT];
        uint64_t this_io_blocks[DDIR_RWDIR_CNT];
        uint64_t io_bytes[DDIR_RWDIR_CNT];
@@ -252,6 +261,7 @@ struct thread_data {
        struct timeval start;   /* start of this loop */
        struct timeval epoch;   /* time job was started */
        struct timeval last_issue;
+       long time_offset;
        struct timeval tv_cache;
        struct timeval terminate_time;
        unsigned int tv_cache_nr;
@@ -393,6 +403,7 @@ extern int helper_do_stat;
 extern pthread_cond_t helper_cond;
 extern char *trigger_file;
 extern char *trigger_cmd;
+extern char *trigger_remote_cmd;
 extern long long trigger_timeout;
 
 extern struct thread_data *threads;
@@ -638,8 +649,12 @@ enum {
        FIO_RAND_DIST_RANDOM    = 0,
        FIO_RAND_DIST_ZIPF,
        FIO_RAND_DIST_PARETO,
+       FIO_RAND_DIST_GAUSS,
 };
 
+#define FIO_DEF_ZIPF           1.1
+#define FIO_DEF_PARETO         0.2
+
 enum {
        FIO_RAND_GEN_TAUSWORTHE = 0,
        FIO_RAND_GEN_LFSR,