projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Fix int vs long problems in parsing some options
[fio.git]
/
filesetup.c
diff --git
a/filesetup.c
b/filesetup.c
index 2e81a1d10c88320e4396d625e99be1e9d9a04a9f..a1633827fe8eca63017bb8a2d91b731dd9854b73 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;
@@
-114,8
+119,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;
@@
-404,8
+409,11
@@
void close_files(struct thread_data *td)
for_each_file(td, f, i) {
if (f->fd != -1) {
for_each_file(td, f, i) {
if (f->fd != -1) {
- if (td->unlink && td->filetype == FIO_TYPE_FILE)
+ if (td->unlink && td->filetype == FIO_TYPE_FILE &&
+ td->filename) {
unlink(f->file_name);
unlink(f->file_name);
+ td->filename = NULL;
+ }
free(f->file_name);
f->file_name = NULL;
close(f->fd);
free(f->file_name);
f->file_name = NULL;
close(f->fd);