projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update close file handler to return potential error
[fio.git]
/
filesetup.c
diff --git
a/filesetup.c
b/filesetup.c
index 5134fdbb8af5a52e08e5ad8b60ea820e0caeab9f..c0403d2a801e863df927ed87a2a935161c7cb394 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,20
+44,25
@@
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");
return 1;
}
f->fd = open(f->file_name, flags, 0644);
if (f->fd < 0) {
td_verror(td, errno, "open");
return 1;
}
+ 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;
}
- if (!new_layout)
- goto done;
-
+ 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");
@@
-234,6
+249,7
@@
int generic_open_file(struct thread_data *td, struct fio_file *f)
if (f->filetype != FIO_TYPE_FILE)
flags |= O_NOATIME;
if (f->filetype != FIO_TYPE_FILE)
flags |= O_NOATIME;
+open_again:
if (td_write(td)) {
assert(!read_only);
if (td_write(td)) {
assert(!read_only);
@@
-262,6
+278,11
@@
int generic_open_file(struct thread_data *td, struct fio_file *f)
char buf[FIO_VERROR_SIZE];
int __e = errno;
char buf[FIO_VERROR_SIZE];
int __e = errno;
+ if (errno == EPERM && (flags & O_NOATIME)) {
+ flags &= ~O_NOATIME;
+ goto open_again;
+ }
+
snprintf(buf, sizeof(buf) - 1, "open(%s)", f->file_name);
td_verror(td, __e, buf);
snprintf(buf, sizeof(buf) - 1, "open(%s)", f->file_name);
td_verror(td, __e, buf);
@@
-282,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) {
@@
-345,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
@@
-374,7
+399,7
@@
int setup_files(struct thread_data *td)
* device/file sizes are zero and no size given, punt
*/
if ((!total_size || total_size == -1ULL) && !td->o.size &&
* device/file sizes are zero and no size given, punt
*/
if ((!total_size || total_size == -1ULL) && !td->o.size &&
- !(td->io_ops->flags & FIO_NOIO)) {
+ !(td->io_ops->flags & FIO_NOIO)
&& !td->o.fill_device
) {
log_err("%s: you need to specify size=\n", td->o.name);
td_verror(td, EINVAL, "total_file_size");
return 1;
log_err("%s: you need to specify size=\n", td->o.name);
td_verror(td, EINVAL, "total_file_size");
return 1;
@@
-397,11
+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) {
- if (f->file_offset > f->real_file_size)
- goto err_offset;
+ if (!f->io_size)
f->io_size = f->real_file_size - f->file_offset;
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)
@@
-414,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)
@@
-478,16
+498,16
@@
err_offset:
int init_random_map(struct thread_data *td)
{
int init_random_map(struct thread_data *td)
{
-
int num_maps, block
s;
+
unsigned long long blocks, num_map
s;
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) {
- blocks = (f->real_file_size + td->o.rw_min_bs - 1) / td->o.rw_min_bs;
- num_maps = (blocks + BLOCKS_PER_MAP-1)/ BLOCKS_PER_MAP;
+ blocks = (f->real_file_size + td->o.rw_min_bs - 1) /
(unsigned long long)
td->o.rw_min_bs;
+ num_maps = (blocks + BLOCKS_PER_MAP-1)/
(unsigned long long)
BLOCKS_PER_MAP;
f->file_map = malloc(num_maps * sizeof(long));
if (!f->file_map) {
log_err("fio: failed allocating random map. If running a large number of jobs, try the 'norandommap' option\n");
f->file_map = malloc(num_maps * sizeof(long));
if (!f->file_map) {
log_err("fio: failed allocating random map. If running a large number of jobs, try the 'norandommap' option\n");
@@
-505,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);
@@
-552,6
+583,8
@@
int add_file(struct thread_data *td, const char *fname)
struct fio_file *f;
int len = 0;
struct fio_file *f;
int len = 0;
+ dprint(FD_FILE, "add file %s\n", fname);
+
td->files = realloc(td->files, (cur_files + 1) * sizeof(*f));
f = &td->files[cur_files];
td->files = realloc(td->files, (cur_files + 1) * sizeof(*f));
f = &td->files[cur_files];
@@
-581,27
+614,33
@@
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;
}
static int recurse_dir(struct thread_data *td, const char *dirname)
}
static int recurse_dir(struct thread_data *td, const char *dirname)