[PATCH] Shorten 'commitrate' to 'CR'

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index c4facfbe995b2f0ed20e88353fb645a528721ec9..e85d6cc1f0ac2011fb79780adb838039cd8b56a0 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -25,11 +25,12 @@ enum fio_ddir {
 };
 
 struct io_stat {
-       unsigned long val;
-       unsigned long val_sq;
        unsigned long max_val;
        unsigned long min_val;
        unsigned long samples;
+
+       double mean;
+       double S;
 };
 
 struct io_sample {
@@ -125,6 +126,7 @@ enum fio_memtype {
        MEM_SHM,        /* use shared memory segments */
        MEM_SHMHUGE,    /* use shared memory segments with huge pages */
        MEM_MMAP,       /* use anonynomous mmap */
+       MEM_MMAPHUGE,   /* memory mapped huge file */
 };
 
 /*
@@ -213,8 +215,10 @@ struct thread_data {
        unsigned int bs[2];
        unsigned int min_bs[2];
        unsigned int max_bs[2];
+       unsigned int hugepage_size;
        unsigned int rw_min_bs;
        unsigned int thinktime;
+       unsigned int thinktime_blocks;
        unsigned int fsync_blocks;
        unsigned int start_delay;
        unsigned long timeout;
@@ -224,6 +228,8 @@ struct thread_data {
        unsigned long long zone_size;
        unsigned long long zone_skip;
        enum fio_memtype mem_type;
+       char *mmapfile;
+       int mmapfd;
        unsigned int stonewall;
        unsigned int numjobs;
        unsigned int iodepth;