projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.dk/fio into steady-state
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index 918b50ad2bf27dafc0d69f9750d106aad29e2fa4..1b58168608046390146765b7f546c9b9d964736e 100644
(file)
--- a/
ioengines.c
+++ b/
ioengines.c
@@
-126,10
+126,11
@@
static struct ioengine_ops *dlopen_ioengine(struct thread_data *td,
struct ioengine_ops *load_ioengine(struct thread_data *td, const char *name)
{
struct ioengine_ops *ops;
struct ioengine_ops *load_ioengine(struct thread_data *td, const char *name)
{
struct ioengine_ops *ops;
- char engine[
16
];
+ char engine[
64
];
dprint(FD_IO, "load ioengine %s\n", name);
dprint(FD_IO, "load ioengine %s\n", name);
+ engine[sizeof(engine) - 1] = '\0';
strncpy(engine, name, sizeof(engine) - 1);
/*
strncpy(engine, name, sizeof(engine) - 1);
/*
@@
-259,7
+260,7
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
fio_ro_check(td, io_u);
assert((io_u->flags & IO_U_F_FLIGHT) == 0);
fio_ro_check(td, io_u);
assert((io_u->flags & IO_U_F_FLIGHT) == 0);
- io_u_set(io_u, IO_U_F_FLIGHT);
+ io_u_set(
td,
io_u, IO_U_F_FLIGHT);
assert(fio_file_open(io_u->file));
assert(fio_file_open(io_u->file));
@@
-271,7
+272,7
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
io_u->error = 0;
io_u->resid = 0;
io_u->error = 0;
io_u->resid = 0;
- if (td
->io_ops->flags & FIO_SYNCIO
) {
+ if (td
_ioengine_flagged(td, FIO_SYNCIO)
) {
if (fio_fill_issue_time(td))
fio_gettime(&io_u->issue_time, NULL);
if (fio_fill_issue_time(td))
fio_gettime(&io_u->issue_time, NULL);
@@
-297,6
+298,7
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
td->io_issues[ddir]--;
td->io_issue_bytes[ddir] -= buflen;
td->rate_io_issue_bytes[ddir] -= buflen;
td->io_issues[ddir]--;
td->io_issue_bytes[ddir] -= buflen;
td->rate_io_issue_bytes[ddir] -= buflen;
+ io_u_clear(td, io_u, IO_U_F_FLIGHT);
}
/*
}
/*
@@
-345,7
+347,7
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
}
}
}
}
- if (
(td->io_ops->flags & FIO_SYNCIO) == 0
) {
+ if (
!td_ioengine_flagged(td, FIO_SYNCIO)
) {
if (fio_fill_issue_time(td))
fio_gettime(&io_u->issue_time, NULL);
if (fio_fill_issue_time(td))
fio_gettime(&io_u->issue_time, NULL);
@@
-374,7
+376,7
@@
int td_io_init(struct thread_data *td)
td->error = ret;
}
td->error = ret;
}
- if (!ret &&
(td->io_ops->flags &
FIO_NOIO))
+ if (!ret &&
td_ioengine_flagged(td,
FIO_NOIO))
td->flags |= TD_F_NOIO;
return ret;
td->flags |= TD_F_NOIO;
return ret;
@@
-440,7
+442,7
@@
int td_io_open_file(struct thread_data *td, struct fio_file *f)
}
}
}
}
- if (td
->io_ops->flags & FIO_DISKLESSIO
)
+ if (td
_ioengine_flagged(td, FIO_DISKLESSIO)
)
goto done;
if (td->o.invalidate_cache && file_invalidate_cache(td, f))
goto done;
if (td->o.invalidate_cache && file_invalidate_cache(td, f))
@@
-482,7
+484,12
@@
int td_io_open_file(struct thread_data *td, struct fio_file *f)
if (ret) {
td_verror(td, ret, "fio_set_odirect");
if (ret) {
td_verror(td, ret, "fio_set_odirect");
- log_err("fio: the file system does not seem to support direct IO\n");
+ if (ret == ENOTTY) { /* ENOTTY suggests RAW device or ZFS */
+ log_err("fio: doing directIO to RAW devices or ZFS not supported\n");
+ } else {
+ log_err("fio: the file system does not seem to support direct IO\n");
+ }
+
goto err;
}
}
goto err;
}
}
@@
-520,8
+527,15
@@
int td_io_unlink_file(struct thread_data *td, struct fio_file *f)
{
if (td->io_ops->unlink_file)
return td->io_ops->unlink_file(td, f);
{
if (td->io_ops->unlink_file)
return td->io_ops->unlink_file(td, f);
- else
- return unlink(f->file_name);
+ else {
+ int ret;
+
+ ret = unlink(f->file_name);
+ if (ret < 0)
+ return errno;
+
+ return 0;
+ }
}
int td_io_get_file_size(struct thread_data *td, struct fio_file *f)
}
int td_io_get_file_size(struct thread_data *td, struct fio_file *f)