[PATCH] Fix busy-looping with aio engine and depth > 1

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 16d5523feb6bf2af4f5f3684010645ceae95ccec..2f41eda23742b0499c10441ac93c2082b8a5bb3c 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -25,8 +25,8 @@ enum fio_ddir {
 };
 
 struct io_stat {
-       unsigned long val;
-       unsigned long val_sq;
+       unsigned long long val;
+       unsigned long long val_sq;
        unsigned long max_val;
        unsigned long min_val;
        unsigned long samples;
@@ -123,7 +123,9 @@ struct group_run_stats {
 enum fio_memtype {
        MEM_MALLOC = 0, /* ordinary malloc */
        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 */
 };
 
 /*
@@ -160,6 +162,8 @@ struct fio_file {
 
        unsigned long *file_map;
        unsigned int num_maps;
+
+       unsigned int unlink;
 };
 
 /*
@@ -210,8 +214,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;
@@ -221,6 +227,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;