fio.h: Fix TD_DDIR_RANDWRITE

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index f8f9a5e458cbe528cd8ef153e50d76da8c0e6193..9b8bed76172f8d9ccdcb29793929997370c3b095 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -34,7 +34,7 @@ enum td_ddir {
        TD_DDIR_RAND            = 1 << 2,
        TD_DDIR_RW              = TD_DDIR_READ | TD_DDIR_WRITE,
        TD_DDIR_RANDREAD        = TD_DDIR_READ | TD_DDIR_RAND,
-       TD_DDIR_RANDWRITE       = TD_DDIR_WRITE | TD_DDIR_READ,
+       TD_DDIR_RANDWRITE       = TD_DDIR_WRITE | TD_DDIR_RAND,
        TD_DDIR_RANDRW          = TD_DDIR_RW | TD_DDIR_RAND,
 };
 
@@ -216,7 +216,6 @@ enum fio_ioengine_flags {
        FIO_RAWIO       = 1 << 3,       /* some sort of direct/raw io */
        FIO_DISKLESSIO  = 1 << 4,       /* no disk involved */
        FIO_SELFOPEN    = 1 << 5,       /* opens its own devices */
-       FIO_NULLIO      = 1 << 6,       /* no real data transfer (cpu/null) */
 };
 
 /*
@@ -289,7 +288,7 @@ struct thread_data {
        char *name;
        char *directory;
        char *filename;
-       char verror[80];
+       char verror[128];
        pthread_t thread;
        int thread_number;
        int groupid;
@@ -297,6 +296,7 @@ struct thread_data {
        enum fio_filetype filetype;
        struct fio_file *files;
        unsigned int nr_files;
+       unsigned int nr_open_files;
        unsigned int nr_uniq_files;
        union {
                unsigned int next_file;
@@ -619,6 +619,8 @@ extern int __must_check init_random_state(struct thread_data *);
 extern void close_files(struct thread_data *);
 extern int __must_check setup_files(struct thread_data *);
 extern int __must_check open_files(struct thread_data *);
+extern int open_file(struct thread_data *, struct fio_file *, int, int);
+extern void close_file(struct thread_data *, struct fio_file *);
 extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_file *);
 
 /*