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 d6df4f9fccb7b699c7e5dcfe292bbd4b6d65d8ac..4fa04ecd6310adcc88c69c53be3f88759557915b 100644
(file)
--- a/
filesetup.c
+++ b/
filesetup.c
@@
-44,12
+44,17
@@
static int create_file(struct thread_data *td, struct fio_file *f)
goto err;
}
goto err;
}
- b = malloc(td->max_bs);
- memset(b, 0, td->max_bs);
+ if (posix_fallocate(f->fd, 0, f->file_size) < 0) {
+ td_verror(td, errno);
+ goto err;
+ }
+
+ b = malloc(td->max_bs[DDIR_WRITE]);
+ memset(b, 0, td->max_bs[DDIR_WRITE]);
left = f->file_size;
while (left && !td->terminate) {
left = f->file_size;
while (left && !td->terminate) {
- bs = td->max_bs;
+ bs = td->max_bs
[DDIR_WRITE]
;
if (bs > left)
bs = left;
if (bs > left)
bs = left;
@@
-88,15
+93,14
@@
static int create_files(struct thread_data *td)
struct fio_file *f;
int i, err, need_create;
struct fio_file *f;
int i, err, need_create;
+ for_each_file(td, f, i)
+ f->file_size = td->total_file_size / td->nr_files;
+
/*
* unless specifically asked for overwrite, let normal io extend it
*/
/*
* unless specifically asked for overwrite, let normal io extend it
*/
- if (!td->overwrite) {
- for_each_file(td, f, i)
- f->file_size = td->total_file_size / td->nr_files;
-
+ if (!td->overwrite)
return 0;
return 0;
- }
need_create = 0;
if (td->filetype == FIO_TYPE_FILE)
need_create = 0;
if (td->filetype == FIO_TYPE_FILE)
@@
-114,8
+118,8
@@
static int create_files(struct thread_data *td)
temp_stall_ts = 1;
fprintf(f_out, "%s: Laying out IO file(s) (%d x %LuMiB == %LuMiB)\n",
temp_stall_ts = 1;
fprintf(f_out, "%s: Laying out IO file(s) (%d x %LuMiB == %LuMiB)\n",
- td->name, td->nr_files,
- (td->total_file_size >> 20) / td->nr_files,
+ td->name, td->nr_
uniq_
files,
+ (td->total_file_size >> 20) / td->nr_
uniq_
files,
td->total_file_size >> 20);
err = 0;
td->total_file_size >> 20);
err = 0;
@@
-347,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
@@
-362,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;
@@
-392,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)
@@
-403,9
+424,12
@@
void close_files(struct thread_data *td)
int i;
for_each_file(td, f, i) {
int i;
for_each_file(td, f, i) {
+ if (td->unlink && td->filetype == FIO_TYPE_FILE) {
+ unlink(f->file_name);
+ free(f->file_name);
+ f->file_name = NULL;
+ }
if (f->fd != -1) {
if (f->fd != -1) {
- if (td->unlink && td->filetype == FIO_TYPE_FILE)
- unlink(f->file_name);
close(f->fd);
f->fd = -1;
}
close(f->fd);
f->fd = -1;
}
@@
-414,4
+438,9
@@
void close_files(struct thread_data *td)
f->mmap = NULL;
}
}
f->mmap = NULL;
}
}
+
+ td->filename = NULL;
+ free(td->files);
+ td->files = NULL;
+ td->nr_files = 0;
}
}