projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gettime: fix race/bug with threads and time keeping
[fio.git]
/
file.h
diff --git
a/file.h
b/file.h
index 42fd58c8d09bb3dd66e4b3d02694282db771c19b..e57bebcffff605c4c5996b88287cb40ff9c9254d 100644
(file)
--- a/
file.h
+++ b/
file.h
@@
-5,6
+5,9
@@
#include "compiler/compiler.h"
#include "io_ddir.h"
#include "flist.h"
#include "compiler/compiler.h"
#include "io_ddir.h"
#include "flist.h"
+#include "lib/zipf.h"
+#include "lib/axmap.h"
+#include "lib/lfsr.h"
/*
* The type of object we are working on
/*
* The type of object we are working on
@@
-60,8
+63,8
@@
struct fio_file {
struct flist_head hash_list;
enum fio_filetype filetype;
struct flist_head hash_list;
enum fio_filetype filetype;
- void *file_data;
int fd;
int fd;
+ int shadow_fd;
#ifdef WIN32
HANDLE hFile;
HANDLE ioCP;
#ifdef WIN32
HANDLE hFile;
HANDLE ioCP;
@@
-94,7
+97,7
@@
struct fio_file {
/*
* For use by the io engine
*/
/*
* For use by the io engine
*/
- u
nsigned long long file_pos
;
+ u
int64_t engine_data
;
/*
* if io is protected by a semaphore, this is set
/*
* if io is protected by a semaphore, this is set
@@
-107,10
+110,14
@@
struct fio_file {
/*
* block map for random io
*/
/*
* block map for random io
*/
- unsigned long *file_map;
- unsigned long num_maps;
- unsigned long last_free_lookup;
- unsigned failed_rands;
+ struct axmap *io_axmap;
+
+ struct fio_lfsr lfsr;
+
+ /*
+ * Used for zipf random distribution
+ */
+ struct zipf_state zipf;
int references;
enum fio_file_flags flags;
int references;
enum fio_file_flags flags;
@@
-171,13
+178,10
@@
extern void free_release_files(struct thread_data *);
static inline void fio_file_reset(struct fio_file *f)
{
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->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(unsigned long));
+ if (f->io_axmap)
+ axmap_reset(f->io_axmap);
}
#endif
}
#endif