projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missed update of dup_files() for dynamically allocated files
[fio.git]
/
filesetup.c
diff --git
a/filesetup.c
b/filesetup.c
index c407d0ef1d28cb182f9c09869cd55d5ba6410d7a..b37de5b726b3203d27eed4c99281948d67a67ed3 100644
(file)
--- a/
filesetup.c
+++ b/
filesetup.c
@@
-33,8
+33,8
@@
static int extend_file(struct thread_data *td, struct fio_file *f)
if (td_write(td) && !td->o.overwrite)
unlink_file = 1;
if (td_write(td) && !td->o.overwrite)
unlink_file = 1;
- if (
(unlink_file || new_layout) && (f->flags & FIO_FILE_EXISTS)
) {
- if (
unlink(f->file_name) < 0
) {
+ if (
unlink_file || new_layout
) {
+ if (
(unlink(f->file_name) < 0) && (errno != ENOENT)
) {
td_verror(td, errno, "unlink");
return 1;
}
td_verror(td, errno, "unlink");
return 1;
}
@@
-44,6
+44,7
@@
static int extend_file(struct thread_data *td, struct fio_file *f)
if (new_layout)
flags |= O_TRUNC;
if (new_layout)
flags |= O_TRUNC;
+ dprint(FD_FILE, "open file %s, flags %x\n", f->file_name, flags);
f->fd = open(f->file_name, flags, 0644);
if (f->fd < 0) {
td_verror(td, errno, "open");
f->fd = open(f->file_name, flags, 0644);
if (f->fd < 0) {
td_verror(td, errno, "open");
@@
-53,11
+54,15
@@
static int extend_file(struct thread_data *td, struct fio_file *f)
if (!new_layout)
goto done;
if (!new_layout)
goto done;
+ dprint(FD_FILE, "truncate file %s, size %llu\n", f->file_name,
+ f->real_file_size);
if (ftruncate(f->fd, f->real_file_size) == -1) {
td_verror(td, errno, "ftruncate");
goto err;
}
if (ftruncate(f->fd, f->real_file_size) == -1) {
td_verror(td, errno, "ftruncate");
goto err;
}
+ dprint(FD_FILE, "fallocate file %s, size %llu\n", f->file_name,
+ f->real_file_size);
if (posix_fallocate(f->fd, 0, f->real_file_size) < 0) {
td_verror(td, errno, "posix_fallocate");
goto err;
if (posix_fallocate(f->fd, 0, f->real_file_size) < 0) {
td_verror(td, errno, "posix_fallocate");
goto err;
@@
-172,6
+177,8
@@
int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
{
int ret = 0;
{
int ret = 0;
+ dprint(FD_IO, "invalidate cache (%d)\n", td->o.odirect);
+
if (td->o.odirect)
return 0;
if (td->o.odirect)
return 0;
@@
-202,10
+209,16
@@
int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
return ret;
}
return ret;
}
-
void
generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
+
int
generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
{
{
- close(f->fd);
+ int ret = 0;
+
+ dprint(FD_FILE, "fd close %s\n", f->file_name);
+ if (close(f->fd) < 0)
+ ret = errno;
+
f->fd = -1;
f->fd = -1;
+ return ret;
}
int generic_open_file(struct thread_data *td, struct fio_file *f)
}
int generic_open_file(struct thread_data *td, struct fio_file *f)
@@
-213,6
+226,8
@@
int generic_open_file(struct thread_data *td, struct fio_file *f)
int is_std = 0;
int flags = 0;
int is_std = 0;
int flags = 0;
+ dprint(FD_FILE, "fd open %s\n", f->file_name);
+
if (!strcmp(f->file_name, "-")) {
if (td_rw(td)) {
log_err("fio: can't read/write to stdin/out\n");
if (!strcmp(f->file_name, "-")) {
if (td_rw(td)) {
log_err("fio: can't read/write to stdin/out\n");
@@
-288,6
+303,8
@@
int open_files(struct thread_data *td)
unsigned int i;
int err = 0;
unsigned int i;
int err = 0;
+ dprint(FD_FILE, "open files\n");
+
for_each_file(td, f, i) {
err = td_io_open_file(td, f);
if (err) {
for_each_file(td, f, i) {
err = td_io_open_file(td, f);
if (err) {
@@
-351,6
+368,8
@@
int setup_files(struct thread_data *td)
unsigned int i;
int err = 0, need_extend;
unsigned int i;
int err = 0, need_extend;
+ dprint(FD_FILE, "setup files\n");
+
/*
* if ioengine defines a setup() method, it's responsible for
* opening the files and setting f->real_file_size to indicate
/*
* if ioengine defines a setup() method, it's responsible for
* opening the files and setting f->real_file_size to indicate
@@
-403,13
+422,8
@@
int setup_files(struct thread_data *td)
* zero, set it to the real file size.
*/
f->io_size = td->o.size / td->o.nr_files;
* zero, set it to the real file size.
*/
f->io_size = td->o.size / td->o.nr_files;
- if ((!f->io_size || f->io_size > f->real_file_size) &&
- f->real_file_size) {
- if (f->file_offset > f->real_file_size)
- goto err_offset;
- if (f->file_offset)
- f->io_size = f->real_file_size - f->file_offset;
- }
+ if (!f->io_size)
+ f->io_size = f->real_file_size - f->file_offset;
} else if (f->real_file_size < td->o.file_size_low ||
f->real_file_size > td->o.file_size_high) {
if (f->file_offset > td->o.file_size_low)
} else if (f->real_file_size < td->o.file_size_low ||
f->real_file_size > td->o.file_size_high) {
if (f->file_offset > td->o.file_size_low)
@@
-422,9
+436,7
@@
int setup_files(struct thread_data *td)
f->io_size = td->o.file_size_low - f->file_offset;
else
f->io_size = get_rand_file_size(td) - f->file_offset;
f->io_size = td->o.file_size_low - f->file_offset;
else
f->io_size = get_rand_file_size(td) - f->file_offset;
- } else if (f->file_offset > f->real_file_size)
- goto err_offset;
- else
+ } else
f->io_size = f->real_file_size - f->file_offset;
if (f->io_size == -1ULL)
f->io_size = f->real_file_size - f->file_offset;
if (f->io_size == -1ULL)
@@
-490,7
+502,7
@@
int init_random_map(struct thread_data *td)
struct fio_file *f;
unsigned int i;
struct fio_file *f;
unsigned int i;
- if (td->o.norandommap)
+ if (td->o.norandommap
|| !td_random(td)
)
return 0;
for_each_file(td, f, i) {
return 0;
for_each_file(td, f, i) {
@@
-513,6
+525,17
@@
void close_files(struct thread_data *td)
struct fio_file *f;
unsigned int i;
struct fio_file *f;
unsigned int i;
+ for_each_file(td, f, i)
+ td_io_close_file(td, f);
+}
+
+void close_and_free_files(struct thread_data *td)
+{
+ struct fio_file *f;
+ unsigned int i;
+
+ dprint(FD_FILE, "close files\n");
+
for_each_file(td, f, i) {
if (td->o.unlink && f->filetype == FIO_TYPE_FILE)
unlink(f->file_name);
for_each_file(td, f, i) {
if (td->o.unlink && f->filetype == FIO_TYPE_FILE)
unlink(f->file_name);
@@
-560,12
+583,16
@@
int add_file(struct thread_data *td, const char *fname)
struct fio_file *f;
int len = 0;
struct fio_file *f;
int len = 0;
-
td->files = realloc(td->files, (cur_files + 1) * sizeof(*f)
);
+
dprint(FD_FILE, "add file %s\n", fname
);
- f =
&td->files[cur_files]
;
+ f =
malloc(sizeof(*f))
;
memset(f, 0, sizeof(*f));
f->fd = -1;
memset(f, 0, sizeof(*f));
f->fd = -1;
+ td->files = realloc(td->files, (cur_files + 1) * sizeof(f));
+
+ td->files[cur_files] = f;
+
/*
* init function, io engine may not be loaded yet
*/
/*
* init function, io engine may not be loaded yet
*/
@@
-589,27
+616,41
@@
int add_file(struct thread_data *td, const char *fname)
void get_file(struct fio_file *f)
{
void get_file(struct fio_file *f)
{
+ dprint(FD_FILE, "get file %s, ref=%d\n", f->file_name, f->references);
assert(f->flags & FIO_FILE_OPEN);
f->references++;
}
assert(f->flags & FIO_FILE_OPEN);
f->references++;
}
-
void
put_file(struct thread_data *td, struct fio_file *f)
+
int
put_file(struct thread_data *td, struct fio_file *f)
{
{
+ int ret = 0;
+
+ dprint(FD_FILE, "put file %s, ref=%d\n", f->file_name, f->references);
+
if (!(f->flags & FIO_FILE_OPEN))
if (!(f->flags & FIO_FILE_OPEN))
- return;
+ return
0
;
assert(f->references);
if (--f->references)
assert(f->references);
if (--f->references)
- return;
+ return
0
;
if (should_fsync(td) && td->o.fsync_on_close)
fsync(f->fd);
if (td->io_ops->close_file)
if (should_fsync(td) && td->o.fsync_on_close)
fsync(f->fd);
if (td->io_ops->close_file)
- td->io_ops->close_file(td, f);
+
ret =
td->io_ops->close_file(td, f);
td->nr_open_files--;
f->flags &= ~FIO_FILE_OPEN;
td->nr_open_files--;
f->flags &= ~FIO_FILE_OPEN;
+ return ret;
+}
+
+void lock_file(struct thread_data *td, struct fio_file *f)
+{
+}
+
+void unlock_file(struct fio_file *f)
+{
}
static int recurse_dir(struct thread_data *td, const char *dirname)
}
static int recurse_dir(struct thread_data *td, const char *dirname)
@@
-678,13
+719,20
@@
void dup_files(struct thread_data *td, struct thread_data *org)
if (!org->files)
return;
if (!org->files)
return;
- bytes = org->files_index * sizeof(
*
f);
+ bytes = org->files_index * sizeof(f);
td->files = malloc(bytes);
memcpy(td->files, org->files, bytes);
for_each_file(td, f, i) {
td->files = malloc(bytes);
memcpy(td->files, org->files, bytes);
for_each_file(td, f, i) {
+ struct fio_file *__f;
+
+ __f = malloc(sizeof(*__f));
+ memset(f, 0, sizeof(*__f));
+
if (f->file_name)
if (f->file_name)
- f->file_name = strdup(f->file_name);
+ __f->file_name = strdup(f->file_name);
+
+ td->files[i] = __f;
}
}
}
}