Grow file num_maps to unsigned long

[fio.git] / file.h

diff --git a/file.h b/file.h
index 63494653bb0d8d582409fb7b34f4ea25bcb353a8..67ef24f109f32da44778745153861249f8490ccd 100644 (file)
--- a/file.h
+++ b/file.h
@@ -1,7 +1,10 @@
 #ifndef FIO_FILE_H
 #define FIO_FILE_H
 
+#include <string.h>
+#include "compiler/compiler.h"
 #include "io_ddir.h"
+#include "flist.h"
 
 /*
  * The type of object we are working on
@@ -39,6 +42,16 @@ enum {
        FIO_FSERVICE_SEQ        = 3,
 };
 
+/*
+ * No pre-allocation when laying down files, or call posix_fallocate(), or
+ * call fallocate() with FALLOC_FL_KEEP_SIZE set.
+ */
+enum fio_fallocate_mode {
+       FIO_FALLOCATE_NONE      = 1,
+       FIO_FALLOCATE_POSIX     = 2,
+       FIO_FALLOCATE_KEEP_SIZE = 3,
+};
+
 /*
  * Each thread_data structure has a number of files associated with it,
  * this structure holds state information for a single file.
@@ -47,13 +60,12 @@ struct fio_file {
        struct flist_head hash_list;
        enum fio_filetype filetype;
 
-       /*
-        * A file may not be a file descriptor, let the io engine decide
-        */
-       union {
-               unsigned long file_data;
-               int fd;
-       };
+       void *file_data;
+       int fd;
+#ifdef __CYGWIN__
+       HANDLE hFile;
+       HANDLE ioCP;
+#endif
 
        /*
         * filename and possible memory mapping
@@ -94,9 +106,10 @@ struct fio_file {
        /*
         * block map for random io
         */
-       unsigned int *file_map;
-       unsigned int num_maps;
-       unsigned int last_free_lookup;
+       unsigned long *file_map;
+       unsigned long num_maps;
+       unsigned long last_free_lookup;
+       unsigned failed_rands;
 
        int references;
        enum fio_file_flags flags;
@@ -156,11 +169,12 @@ extern void free_release_files(struct thread_data *);
 static inline void fio_file_reset(struct fio_file *f)
 {
        f->last_free_lookup = 0;
+       f->failed_rands = 0;
        f->last_pos = f->file_offset;
        f->last_start = -1ULL;
        f->file_pos = -1ULL;
        if (f->file_map)
-               memset(f->file_map, 0, f->num_maps * sizeof(int));
+               memset(f->file_map, 0, f->num_maps * sizeof(unsigned long));
 }
 
 #endif