projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Always open the files from the job itself
[fio.git]
/
filesetup.c
diff --git
a/filesetup.c
b/filesetup.c
index 705eb4a90cb3b12a2b98802718a1d5c3584c7ac5..4fa04ecd6310adcc88c69c53be3f88759557915b 100644
(file)
--- a/
filesetup.c
+++ b/
filesetup.c
@@
-351,10
+351,24
@@
static int setup_file(struct thread_data *td, struct fio_file *f)
return 0;
}
return 0;
}
+int open_files(struct thread_data *td)
+{
+ struct fio_file *f;
+ int i, err = 0;
+
+ for_each_file(td, f, i) {
+ err = setup_file(td, f);
+ if (err)
+ break;
+ }
+
+ return err;
+}
+
int setup_files(struct thread_data *td)
{
struct fio_file *f;
int setup_files(struct thread_data *td)
{
struct fio_file *f;
- int
i, err
;
+ int
err, i
;
/*
* if ioengine defines a setup() method, it's responsible for
/*
* if ioengine defines a setup() method, it's responsible for
@@
-366,13
+380,7
@@
int setup_files(struct thread_data *td)
if (create_files(td))
return 1;
if (create_files(td))
return 1;
- err = 0;
- for_each_file(td, f, i) {
- err = setup_file(td, f);
- if (err)
- break;
- }
-
+ err = open_files(td);
if (err)
return err;
if (err)
return err;
@@
-396,9
+404,18
@@
int setup_files(struct thread_data *td)
td->total_io_size = td->io_size * td->loops;
if (td->io_ops->flags & FIO_MMAPIO)
td->total_io_size = td->io_size * td->loops;
if (td->io_ops->flags & FIO_MMAPIO)
-
return
setup_files_mmap(td);
+
err =
setup_files_mmap(td);
else
else
- return setup_files_plain(td);
+ err = setup_files_plain(td);
+
+ for_each_file(td, f, i) {
+ if (f->fd != -1) {
+ close(f->fd);
+ f->fd = -1;
+ }
+ }
+
+ return err;
}
void close_files(struct thread_data *td)
}
void close_files(struct thread_data *td)
@@
-407,16
+424,15
@@
void close_files(struct thread_data *td)
int i;
for_each_file(td, f, i) {
int i;
for_each_file(td, f, i) {
- if (f->fd != -1) {
- file_invalidate_cache(td, f);
- close(f->fd);
- f->fd = -1;
- }
if (td->unlink && td->filetype == FIO_TYPE_FILE) {
unlink(f->file_name);
free(f->file_name);
f->file_name = NULL;
}
if (td->unlink && td->filetype == FIO_TYPE_FILE) {
unlink(f->file_name);
free(f->file_name);
f->file_name = NULL;
}
+ if (f->fd != -1) {
+ close(f->fd);
+ f->fd = -1;
+ }
if (f->mmap) {
munmap(f->mmap, f->file_size);
f->mmap = NULL;
if (f->mmap) {
munmap(f->mmap, f->file_size);
f->mmap = NULL;