projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blktrace: various bug fixes and improvements
[fio.git]
/
filesetup.c
diff --git
a/filesetup.c
b/filesetup.c
index ad7fb8551da7b87889e3e0ec5d087089e918b5fd..39c276a3d2203180772a1e9a88974dc545d360fd 100644
(file)
--- a/
filesetup.c
+++ b/
filesetup.c
@@
-390,6
+390,10
@@
static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
{
int ret = 0;
{
int ret = 0;
+#ifdef CONFIG_ESX
+ return 0;
+#endif
+
if (len == -1ULL)
len = f->io_size;
if (off == -1ULL)
if (len == -1ULL)
len = f->io_size;
if (off == -1ULL)
@@
-401,7
+405,9
@@
static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
dprint(FD_IO, "invalidate cache %s: %llu/%llu\n", f->file_name, off,
len);
dprint(FD_IO, "invalidate cache %s: %llu/%llu\n", f->file_name, off,
len);
- if (f->mmap_ptr) {
+ if (td->io_ops->invalidate)
+ ret = td->io_ops->invalidate(td, f);
+ else if (f->mmap_ptr) {
ret = posix_madvise(f->mmap_ptr, f->mmap_sz, POSIX_MADV_DONTNEED);
#ifdef FIO_MADV_FREE
if (f->filetype == FIO_TYPE_BD)
ret = posix_madvise(f->mmap_ptr, f->mmap_sz, POSIX_MADV_DONTNEED);
#ifdef FIO_MADV_FREE
if (f->filetype == FIO_TYPE_BD)
@@
-603,6
+609,7
@@
open_again:
}
td_verror(td, __e, buf);
}
td_verror(td, __e, buf);
+ return 1;
}
if (!from_hash && f->fd != -1) {
}
if (!from_hash && f->fd != -1) {
@@
-655,6
+662,7
@@
static int get_file_sizes(struct thread_data *td)
if (td->error != ENOENT) {
log_err("%s\n", td->verror);
err = 1;
if (td->error != ENOENT) {
log_err("%s\n", td->verror);
err = 1;
+ break;
}
clear_error(td);
}
}
clear_error(td);
}
@@
-1522,6
+1530,8
@@
int get_fileno(struct thread_data *td, const char *fname)
void free_release_files(struct thread_data *td)
{
close_files(td);
void free_release_files(struct thread_data *td)
{
close_files(td);
+ td->o.nr_files = 0;
+ td->o.open_files = 0;
td->files_index = 0;
td->nr_normal_files = 0;
}
td->files_index = 0;
td->nr_normal_files = 0;
}