projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/bvanassche/fio
[fio.git]
/
filesetup.c
diff --git
a/filesetup.c
b/filesetup.c
index 1d586b171e8bccad658b8a05945723d89c2ae5a6..1a187ff2648d35c933740852751cd147c2ec0a36 100644
(file)
--- a/
filesetup.c
+++ b/
filesetup.c
@@
-20,8
+20,6
@@
#include <linux/falloc.h>
#endif
#include <linux/falloc.h>
#endif
-static int root_warn;
-
static FLIST_HEAD(filename_list);
/*
static FLIST_HEAD(filename_list);
/*
@@
-490,6
+488,10
@@
static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
ret = td->io_ops->invalidate(td, f);
if (ret < 0)
errval = -ret;
ret = td->io_ops->invalidate(td, f);
if (ret < 0)
errval = -ret;
+ } else if (td_ioengine_flagged(td, FIO_DISKLESSIO)) {
+ dprint(FD_IO, "invalidate not supported by ioengine %s\n",
+ td->io_ops->name);
+ ret = 0;
} else if (f->filetype == FIO_TYPE_FILE) {
dprint(FD_IO, "declare unneeded cache %s: %llu/%llu\n",
f->file_name, off, len);
} else if (f->filetype == FIO_TYPE_FILE) {
dprint(FD_IO, "declare unneeded cache %s: %llu/%llu\n",
f->file_name, off, len);
@@
-512,10
+514,9
@@
static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
ret = blockdev_invalidate_cache(f);
}
if (ret < 0 && errno == EACCES && geteuid()) {
ret = blockdev_invalidate_cache(f);
}
if (ret < 0 && errno == EACCES && geteuid()) {
- if (!
root_warn
) {
+ if (!
fio_did_warn(FIO_WARN_ROOT_FLUSH)
) {
log_err("fio: only root may flush block "
"devices. Cache flush bypassed!\n");
log_err("fio: only root may flush block "
"devices. Cache flush bypassed!\n");
- root_warn = 1;
}
ret = 0;
}
}
ret = 0;
}
@@
-1035,7
+1036,7
@@
int setup_files(struct thread_data *td)
if (f->io_size == -1ULL)
total_size = -1ULL;
else {
if (f->io_size == -1ULL)
total_size = -1ULL;
else {
- if (o->size_percent) {
+ if (o->size_percent
&& o->size_percent != 100
) {
uint64_t file_size;
file_size = f->io_size + f->file_offset;
uint64_t file_size;
file_size = f->io_size + f->file_offset;
@@
-1480,7
+1481,7
@@
static struct fio_file *alloc_new_file(struct thread_data *td)
if (td_ioengine_flagged(td, FIO_NOFILEHASH))
f = calloc(1, sizeof(*f));
else
if (td_ioengine_flagged(td, FIO_NOFILEHASH))
f = calloc(1, sizeof(*f));
else
- f = s
malloc(
sizeof(*f));
+ f = s
calloc(1,
sizeof(*f));
if (!f) {
assert(0);
return NULL;
if (!f) {
assert(0);
return NULL;
@@
-1628,8
+1629,6
@@
int add_file(struct thread_data *td, const char *fname, int numjob, int inc)
}
td->files_index++;
}
td->files_index++;
- if (f->filetype == FIO_TYPE_FILE)
- td->nr_normal_files++;
if (td->o.numjobs > 1)
set_already_allocated(file_name);
if (td->o.numjobs > 1)
set_already_allocated(file_name);
@@
-1855,7
+1854,6
@@
void free_release_files(struct thread_data *td)
td->o.nr_files = 0;
td->o.open_files = 0;
td->files_index = 0;
td->o.nr_files = 0;
td->o.open_files = 0;
td->files_index = 0;
- td->nr_normal_files = 0;
}
void fio_file_reset(struct thread_data *td, struct fio_file *f)
}
void fio_file_reset(struct thread_data *td, struct fio_file *f)