projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace redundant TD_F_NOIO flag with td->io_ops_init
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index e2e7280a8edcd0b46a2a2c9daa56914483cca143..c773f2ed3464a08fa6a51464d33d68a0231fc553 100644
(file)
--- a/
ioengines.c
+++ b/
ioengines.c
@@
-119,17
+119,18
@@
static struct ioengine_ops *dlopen_ioengine(struct thread_data *td,
return NULL;
}
return NULL;
}
-
ops->
dlhandle = dlhandle;
+
td->io_ops_
dlhandle = dlhandle;
return ops;
}
struct ioengine_ops *load_ioengine(struct thread_data *td, const char *name)
{
return ops;
}
struct ioengine_ops *load_ioengine(struct thread_data *td, const char *name)
{
- struct ioengine_ops *ops
, *ret
;
- char engine[
16
];
+ struct ioengine_ops *ops;
+ 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);
/*
@@
-153,11
+154,7
@@
struct ioengine_ops *load_ioengine(struct thread_data *td, const char *name)
if (check_engine_ops(ops))
return NULL;
if (check_engine_ops(ops))
return NULL;
- ret = malloc(sizeof(*ret));
- memcpy(ret, ops, sizeof(*ret));
- ret->data = NULL;
-
- return ret;
+ return ops;
}
/*
}
/*
@@
-173,10
+170,9
@@
void free_ioengine(struct thread_data *td)
td->eo = NULL;
}
td->eo = NULL;
}
- if (td->io_ops
->
dlhandle)
- dlclose(td->io_ops
->
dlhandle);
+ if (td->io_ops
_
dlhandle)
+ dlclose(td->io_ops
_
dlhandle);
- free(td->io_ops);
td->io_ops = NULL;
}
td->io_ops = NULL;
}
@@
-186,7
+182,7
@@
void close_ioengine(struct thread_data *td)
if (td->io_ops->cleanup) {
td->io_ops->cleanup(td);
if (td->io_ops->cleanup) {
td->io_ops->cleanup(td);
- td->io_ops
->
data = NULL;
+ td->io_ops
_
data = NULL;
}
free_ioengine(td);
}
free_ioengine(td);
@@
-264,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));
@@
-276,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);
@@
-302,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);
}
/*
}
/*
@@
-350,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);
@@
-371,17
+368,17
@@
int td_io_init(struct thread_data *td)
if (td->io_ops->init) {
ret = td->io_ops->init(td);
if (td->io_ops->init) {
ret = td->io_ops->init(td);
- if (ret && td->o.iodepth > 1) {
- log_err("fio: io engine init failed. Perhaps try"
- " reducing io depth?\n");
- }
+ if (ret)
+ log_err("fio: io engine %s init failed.%s\n",
+ td->io_ops->name,
+ td->o.iodepth > 1 ?
+ " Perhaps try reducing io depth?" : "");
+ else
+ td->io_ops_init = 1;
if (!td->error)
td->error = ret;
}
if (!td->error)
td->error = ret;
}
- if (!ret && (td->io_ops->flags & FIO_NOIO))
- td->flags |= TD_F_NOIO;
-
return ret;
}
return ret;
}
@@
-445,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 &&
- (f->filetype == FIO_TYPE_B
D
|| f->filetype == FIO_TYPE_FILE)) {
+ if (td->o.fadvise_hint
!= F_ADV_NONE
&&
+ (f->filetype == FIO_TYPE_B
LOCK
|| f->filetype == FIO_TYPE_FILE)) {
int flags;
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");
@@
-467,7
+474,7
@@
int td_io_open_file(struct thread_data *td, struct fio_file *f)
}
#ifdef FIO_HAVE_STREAMID
if (td->o.fadvise_stream &&
}
#ifdef FIO_HAVE_STREAMID
if (td->o.fadvise_stream &&
- (f->filetype == FIO_TYPE_B
D
|| f->filetype == FIO_TYPE_FILE)) {
+ (f->filetype == FIO_TYPE_B
LOCK
|| f->filetype == FIO_TYPE_FILE)) {
off_t stream = td->o.fadvise_stream;
if (posix_fadvise(f->fd, stream, f->io_size, POSIX_FADV_STREAMID) < 0) {
off_t stream = td->o.fadvise_stream;
if (posix_fadvise(f->fd, stream, f->io_size, POSIX_FADV_STREAMID) < 0) {
@@
-487,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;
}
}
@@
-525,8
+537,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)
@@
-599,15
+618,15
@@
int fio_show_ioengine_help(const char *engine)
{
struct flist_head *entry;
struct thread_data td;
{
struct flist_head *entry;
struct thread_data td;
+ struct ioengine_ops *io_ops;
char *sep;
int ret = 1;
if (!engine || !*engine) {
log_info("Available IO engines:\n");
flist_for_each(entry, &engine_list) {
char *sep;
int ret = 1;
if (!engine || !*engine) {
log_info("Available IO engines:\n");
flist_for_each(entry, &engine_list) {
- td.io_ops = flist_entry(entry, struct ioengine_ops,
- list);
- log_info("\t%s\n", td.io_ops->name);
+ io_ops = flist_entry(entry, struct ioengine_ops, list);
+ log_info("\t%s\n", io_ops->name);
}
return 0;
}
}
return 0;
}
@@
-619,16
+638,16
@@
int fio_show_ioengine_help(const char *engine)
memset(&td, 0, sizeof(td));
memset(&td, 0, sizeof(td));
-
td.
io_ops = load_ioengine(&td, engine);
- if (!
td.
io_ops) {
+ io_ops = load_ioengine(&td, engine);
+ if (!io_ops) {
log_info("IO engine %s not found\n", engine);
return 1;
}
log_info("IO engine %s not found\n", engine);
return 1;
}
- if (
td.
io_ops->options)
- ret = show_cmd_help(
td.
io_ops->options, sep);
+ if (io_ops->options)
+ ret = show_cmd_help(io_ops->options, sep);
else
else
- log_info("IO engine %s has no options\n",
td.
io_ops->name);
+ log_info("IO engine %s has no options\n", io_ops->name);
free_ioengine(&td);
free_ioengine(&td);