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 9dd08731e63f7e47ed049fbbca469198da36da39..e57bebcffff605c4c5996b88287cb40ff9c9254d 100644
(file)
--- a/
file.h
+++ b/
file.h
@@
-6,7
+6,7
@@
#include "io_ddir.h"
#include "flist.h"
#include "lib/zipf.h"
#include "io_ddir.h"
#include "flist.h"
#include "lib/zipf.h"
-#include "lib/
bit
map.h"
+#include "lib/
ax
map.h"
#include "lib/lfsr.h"
/*
#include "lib/lfsr.h"
/*
@@
-63,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;
@@
-97,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
@@
-110,7
+110,7
@@
struct fio_file {
/*
* block map for random io
*/
/*
* block map for random io
*/
- struct
bitmap *io_bit
map;
+ struct
axmap *io_ax
map;
struct fio_lfsr lfsr;
struct fio_lfsr lfsr;
@@
-180,9
+180,8
@@
static inline void fio_file_reset(struct fio_file *f)
{
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->io_bitmap)
- bitmap_reset(f->io_bitmap);
+ if (f->io_axmap)
+ axmap_reset(f->io_axmap);
}
#endif
}
#endif