X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=file.h;h=b3ff05148458e1a1d0d5a70e0c0fd874fa892b18;hp=ebef6452d5d82b448faee05b7ef9da0be8e7ec16;hb=1c964ce59ba23b1ab515a8f0b6506329c1c3d3e1;hpb=0e238572c4e63b0675fd9cbbf168d19ad8d60464

diff --git a/file.h b/file.h
index ebef6452..b3ff0514 100644
--- 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,11 +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
-	 */
-	unsigned long file_data;
+	void *file_data;
 	int fd;
+#ifdef __CYGWIN__
+	HANDLE hFile;
+	HANDLE ioCP;
+#endif
 
 	/*
 	 * filename and possible memory mapping
@@ -92,9 +106,10 @@ struct fio_file {
 	/*
 	 * block map for random io
 	 */
-	unsigned int *file_map;
+	unsigned long *file_map;
 	unsigned int num_maps;
 	unsigned int last_free_lookup;
+	unsigned int failed_rands;
 
 	int references;
 	enum fio_file_flags flags;
@@ -154,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