projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce enum fio_q_status
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index 9638d8043753627f60ffc223b8308ca6f61d57af..6ffd27f10ec9e303b16a7e00ffefec000cab67d2 100644
(file)
--- a/
ioengines.c
+++ b/
ioengines.c
@@
-9,7
+9,6
@@
* generic io engine that could be used for other projects.
*
*/
* generic io engine that could be used for other projects.
*
*/
-#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
@@
-52,14
+51,12
@@
static bool check_engine_ops(struct ioengine_ops *ops)
void unregister_ioengine(struct ioengine_ops *ops)
{
dprint(FD_IO, "ioengine %s unregistered\n", ops->name);
void unregister_ioengine(struct ioengine_ops *ops)
{
dprint(FD_IO, "ioengine %s unregistered\n", ops->name);
- flist_del(&ops->list);
- INIT_FLIST_HEAD(&ops->list);
+ flist_del_init(&ops->list);
}
void register_ioengine(struct ioengine_ops *ops)
{
dprint(FD_IO, "ioengine %s registered\n", ops->name);
}
void register_ioengine(struct ioengine_ops *ops)
{
dprint(FD_IO, "ioengine %s registered\n", ops->name);
- INIT_FLIST_HEAD(&ops->list);
flist_add_tail(&ops->list, &engine_list);
}
flist_add_tail(&ops->list, &engine_list);
}
@@
-133,8
+130,10
@@
static struct ioengine_ops *__load_ioengine(const char *name)
/*
* linux libaio has alias names, so convert to what we want
*/
/*
* linux libaio has alias names, so convert to what we want
*/
- if (!strncmp(engine, "linuxaio", 8) || !strncmp(engine, "aio", 3))
+ if (!strncmp(engine, "linuxaio", 8) || !strncmp(engine, "aio", 3)) {
+ dprint(FD_IO, "converting ioengine name: %s -> libaio\n", name);
strcpy(engine, "libaio");
strcpy(engine, "libaio");
+ }
dprint(FD_IO, "load ioengine %s\n", engine);
return find_ioengine(engine);
dprint(FD_IO, "load ioengine %s\n", engine);
return find_ioengine(engine);
@@
-194,8
+193,10
@@
void free_ioengine(struct thread_data *td)
td->eo = NULL;
}
td->eo = NULL;
}
- if (td->io_ops_dlhandle)
+ if (td->io_ops_dlhandle)
{
dlclose(td->io_ops_dlhandle);
dlclose(td->io_ops_dlhandle);
+ td->io_ops_dlhandle = NULL;
+ }
td->io_ops = NULL;
}
td->io_ops = NULL;
}
@@
-222,7
+223,8
@@
int td_io_prep(struct thread_data *td, struct io_u *io_u)
if (td->io_ops->prep) {
int ret = td->io_ops->prep(td, io_u);
if (td->io_ops->prep) {
int ret = td->io_ops->prep(td, io_u);
- dprint(FD_IO, "->prep(%p)=%d\n", io_u, ret);
+ dprint(FD_IO, "prep: io_u %p: ret=%d\n", io_u, ret);
+
if (ret)
unlock_file(td, io_u->file);
return ret;
if (ret)
unlock_file(td, io_u->file);
return ret;
@@
-274,11
+276,11
@@
out:
return r;
}
return r;
}
-
int
td_io_queue(struct thread_data *td, struct io_u *io_u)
+
enum fio_q_status
td_io_queue(struct thread_data *td, struct io_u *io_u)
{
const enum fio_ddir ddir = acct_ddir(io_u);
unsigned long buflen = io_u->xfer_buflen;
{
const enum fio_ddir ddir = acct_ddir(io_u);
unsigned long buflen = io_u->xfer_buflen;
-
int
ret;
+
enum fio_q_status
ret;
dprint_io_u(io_u, "queue");
fio_ro_check(td, io_u);
dprint_io_u(io_u, "queue");
fio_ro_check(td, io_u);
@@
-309,8
+311,10
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
}
if (ddir_rw(ddir)) {
}
if (ddir_rw(ddir)) {
- td->io_issues[ddir]++;
- td->io_issue_bytes[ddir] += buflen;
+ if (!(io_u->flags & IO_U_F_VER_LIST)) {
+ td->io_issues[ddir]++;
+ td->io_issue_bytes[ddir] += buflen;
+ }
td->rate_io_issue_bytes[ddir] += buflen;
}
td->rate_io_issue_bytes[ddir] += buflen;
}
@@
-352,23
+356,18
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
}
if (ret == FIO_Q_COMPLETED) {
}
if (ret == FIO_Q_COMPLETED) {
- if (ddir_rw(io_u->ddir)) {
+ if (ddir_rw(io_u->ddir)
|| ddir_sync(io_u->ddir)
) {
io_u_mark_depth(td, 1);
td->ts.total_io_u[io_u->ddir]++;
}
} else if (ret == FIO_Q_QUEUED) {
io_u_mark_depth(td, 1);
td->ts.total_io_u[io_u->ddir]++;
}
} else if (ret == FIO_Q_QUEUED) {
- int r;
-
td->io_u_queued++;
td->io_u_queued++;
- if (ddir_rw(io_u->ddir))
+ if (ddir_rw(io_u->ddir)
|| ddir_sync(io_u->ddir)
)
td->ts.total_io_u[io_u->ddir]++;
td->ts.total_io_u[io_u->ddir]++;
- if (td->io_u_queued >= td->o.iodepth_batch) {
- r = td_io_commit(td);
- if (r < 0)
- return r;
- }
+ if (td->io_u_queued >= td->o.iodepth_batch)
+ td_io_commit(td);
}
if (!td_ioengine_flagged(td, FIO_SYNCIO)) {
}
if (!td_ioengine_flagged(td, FIO_SYNCIO)) {
@@
-406,14
+405,14
@@
int td_io_init(struct thread_data *td)
return ret;
}
return ret;
}
-
int
td_io_commit(struct thread_data *td)
+
void
td_io_commit(struct thread_data *td)
{
int ret;
dprint(FD_IO, "calling ->commit(), depth %d\n", td->cur_depth);
if (!td->cur_depth || !td->io_u_queued)
{
int ret;
dprint(FD_IO, "calling ->commit(), depth %d\n", td->cur_depth);
if (!td->cur_depth || !td->io_u_queued)
- return
0
;
+ return;
io_u_mark_depth(td, td->io_u_queued);
io_u_mark_depth(td, td->io_u_queued);
@@
-428,14
+427,13
@@
int td_io_commit(struct thread_data *td)
*/
td->io_u_in_flight += td->io_u_queued;
td->io_u_queued = 0;
*/
td->io_u_in_flight += td->io_u_queued;
td->io_u_queued = 0;
-
- return 0;
}
int td_io_open_file(struct thread_data *td, struct fio_file *f)
{
assert(!fio_file_open(f));
assert(f->fd == -1);
}
int td_io_open_file(struct thread_data *td, struct fio_file *f)
{
assert(!fio_file_open(f));
assert(f->fd == -1);
+ assert(td->io_ops->open_file);
if (td->io_ops->open_file(td, f)) {
if (td->error == EINVAL && td->o.odirect)
if (td->io_ops->open_file(td, f)) {
if (td->error == EINVAL && td->o.odirect)
@@
-492,8
+490,8
@@
int td_io_open_file(struct thread_data *td, struct fio_file *f)
}
if (posix_fadvise(f->fd, f->file_offset, f->io_size, flags) < 0) {
}
if (posix_fadvise(f->fd, f->file_offset, f->io_size, flags) < 0) {
- td_verror(td, errno, "fadvise");
-
goto err
;
+ if (!fio_did_warn(FIO_WARN_FADVISE))
+
log_err("fio: fadvise hint failed\n")
;
}
}
#ifdef FIO_HAVE_WRITE_HINT
}
}
#ifdef FIO_HAVE_WRITE_HINT