Merge branch 'master' into gfio

[fio.git] / file.h

diff --git a/file.h b/file.h
index 04c0d4536b4f16aa91ca58609de80c1f973228c7..42fd58c8d09bb3dd66e4b3d02694282db771c19b 100644 (file)
--- a/file.h
+++ b/file.h
@@ -42,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.
@@ -52,7 +62,7 @@ struct fio_file {
 
        void *file_data;
        int fd;
-#ifdef __CYGWIN__
+#ifdef WIN32
        HANDLE hFile;
        HANDLE ioCP;
 #endif
@@ -62,6 +72,7 @@ struct fio_file {
         */
        char *file_name;
        unsigned int major, minor;
+       int fileno;
 
        void *mmap_ptr;
        size_t mmap_sz;
@@ -97,9 +108,9 @@ struct fio_file {
         * block map for random io
         */
        unsigned long *file_map;
-       unsigned int num_maps;
-       unsigned int last_free_lookup;
-       unsigned int failed_rands;
+       unsigned long num_maps;
+       unsigned long last_free_lookup;
+       unsigned failed_rands;
 
        int references;
        enum fio_file_flags flags;
@@ -136,11 +147,13 @@ FILE_FLAG_FNS(partial_mmap);
 struct thread_data;
 extern void close_files(struct thread_data *);
 extern void close_and_free_files(struct thread_data *);
+extern unsigned long long get_start_offset(struct thread_data *);
 extern int __must_check setup_files(struct thread_data *);
 extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_file *);
 extern int __must_check generic_open_file(struct thread_data *, struct fio_file *);
 extern int __must_check generic_close_file(struct thread_data *, struct fio_file *);
 extern int __must_check generic_get_file_size(struct thread_data *, struct fio_file *);
+extern int __must_check file_lookup_open(struct fio_file *f, int flags);
 extern int __must_check pre_read_files(struct thread_data *);
 extern int add_file(struct thread_data *, const char *);
 extern int add_file_exclusive(struct thread_data *, const char *);