projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Partly revert 8172fe97 in 2008 (A few debug debug log fixes)
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index a06909e0ff9d5140c3ea065dbb2a5821c27e68a3..a1f8756d086ca5d06c5e1de063ec702f8294a228 100644
(file)
--- a/
ioengines.c
+++ b/
ioengines.c
@@
-260,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));
@@
-272,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);
@@
-298,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);
}
/*
}
/*
@@
-346,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);
@@
-375,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;
@@
-441,20
+442,30
@@
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 err;
goto done;
if (td->o.invalidate_cache && file_invalidate_cache(td, f))
goto err;
- if (td->o.fadvise_hint &&
+ if (td->o.fadvise_hint
!= F_ADV_NONE
&&
(f->filetype == FIO_TYPE_BD || f->filetype == FIO_TYPE_FILE)) {
int flags;
(f->filetype == FIO_TYPE_BD || f->filetype == FIO_TYPE_FILE)) {
int flags;
- if (td_random(td))
+ if (td->o.fadvise_hint == F_ADV_TYPE) {
+ if (td_random(td))
+ flags = POSIX_FADV_RANDOM;
+ else
+ flags = POSIX_FADV_SEQUENTIAL;
+ } else if (td->o.fadvise_hint == F_ADV_RANDOM)
flags = POSIX_FADV_RANDOM;
flags = POSIX_FADV_RANDOM;
- else
+ else
if (td->o.fadvise_hint == F_ADV_SEQUENTIAL)
flags = POSIX_FADV_SEQUENTIAL;
flags = POSIX_FADV_SEQUENTIAL;
+ else {
+ log_err("fio: unknown fadvise type %d\n",
+ td->o.fadvise_hint);
+ flags = POSIX_FADV_NORMAL;
+ }
if (posix_fadvise(f->fd, f->file_offset, f->io_size, flags) < 0) {
td_verror(td, errno, "fadvise");
if (posix_fadvise(f->fd, f->file_offset, f->io_size, flags) < 0) {
td_verror(td, errno, "fadvise");
@@
-483,7
+494,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;
}
}