projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
close_ioengine() clears ->data after calling engine cleanup
[fio.git]
/
engines
/
posixaio.c
diff --git
a/engines/posixaio.c
b/engines/posixaio.c
index 71601fdd31c8df937cc08498c04d308875135d5e..acd215c2f9f01a27bce0fa2b4f3a0ea7a438e8d7 100644
(file)
--- a/
engines/posixaio.c
+++ b/
engines/posixaio.c
@@
-1,5
+1,7
@@
/*
/*
- * posix aio io engine
+ * posixaio engine
+ *
+ * IO engine that uses the posix defined aio interface.
*
*/
#include <stdio.h>
*
*/
#include <stdio.h>
@@
-9,7
+11,6
@@
#include <assert.h>
#include "../fio.h"
#include <assert.h>
#include "../fio.h"
-#include "../os.h"
#ifdef FIO_HAVE_POSIXAIO
#ifdef FIO_HAVE_POSIXAIO
@@
-75,18
+76,24
@@
static int fio_posixaio_prep(struct thread_data fio_unused *td,
return 0;
}
return 0;
}
-static int fio_posixaio_getevents(struct thread_data *td, int min, int max,
- struct timespec *t)
+#define SUSPEND_ENTRIES 8
+
+static int fio_posixaio_getevents(struct thread_data *td, unsigned int min,
+ unsigned int max, struct timespec *t)
{
struct posixaio_data *pd = td->io_ops->data;
{
struct posixaio_data *pd = td->io_ops->data;
+ struct aiocb *suspend_list[SUSPEND_ENTRIES];
struct list_head *entry;
struct timespec start;
struct list_head *entry;
struct timespec start;
- int r, have_timeout = 0;
+ int have_timeout = 0;
+ int suspend_entries = 0;
+ unsigned int r;
if (t && !fill_timespec(&start))
have_timeout = 1;
r = 0;
if (t && !fill_timespec(&start))
have_timeout = 1;
r = 0;
+ memset(suspend_list, 0, sizeof(*suspend_list));
restart:
list_for_each(entry, &td->io_u_busylist) {
struct io_u *io_u = list_entry(entry, struct io_u, list);
restart:
list_for_each(entry, &td->io_u_busylist) {
struct io_u *io_u = list_entry(entry, struct io_u, list);
@@
-96,18
+103,26
@@
restart:
continue;
err = aio_error(&io_u->aiocb);
continue;
err = aio_error(&io_u->aiocb);
- switch (err) {
- default:
- io_u->error = err;
- case ECANCELED:
- case 0:
- pd->aio_events[r++] = io_u;
- io_u->seen = 1;
- break;
- case EINPROGRESS:
- break;
+ if (err == EINPROGRESS) {
+ if (suspend_entries < SUSPEND_ENTRIES) {
+ suspend_list[suspend_entries] = &io_u->aiocb;
+ suspend_entries++;
+ }
+ continue;
}
}
+ io_u->seen = 1;
+ pd->aio_events[r++] = io_u;
+
+ if (err == ECANCELED)
+ io_u->resid = io_u->xfer_buflen;
+ else if (!err) {
+ ssize_t retval = aio_return(&io_u->aiocb);
+
+ io_u->resid = io_u->xfer_buflen - retval;
+ } else
+ io_u->error = err;
+
if (r >= max)
break;
}
if (r >= max)
break;
}
@@
-124,10
+139,10
@@
restart:
}
/*
}
/*
- * hrmpf, we need to wait for more. we should use aio_suspend, for
- * now just sleep a little and recheck status of busy-and-not-seen
+ * must have some in-flight, wait for at least one
*/
*/
- usleep(1000);
+ aio_suspend((const struct aiocb * const *)suspend_list,
+ suspend_entries, t);
goto restart;
}
goto restart;
}
@@
-144,6
+159,8
@@
static int fio_posixaio_queue(struct thread_data fio_unused *td,
struct aiocb *aiocb = &io_u->aiocb;
int ret;
struct aiocb *aiocb = &io_u->aiocb;
int ret;
+ fio_ro_check(td, io_u);
+
if (io_u->ddir == DDIR_READ)
ret = aio_read(aiocb);
else if (io_u->ddir == DDIR_WRITE)
if (io_u->ddir == DDIR_READ)
ret = aio_read(aiocb);
else if (io_u->ddir == DDIR_WRITE)
@@
-151,10
+168,13
@@
static int fio_posixaio_queue(struct thread_data fio_unused *td,
else
ret = aio_fsync(O_SYNC, aiocb);
else
ret = aio_fsync(O_SYNC, aiocb);
- if (ret)
+ if (ret)
{
io_u->error = errno;
io_u->error = errno;
-
- return io_u->error;
+ td_verror(td, io_u->error, "xfer");
+ return FIO_Q_COMPLETED;
+ }
+
+ return FIO_Q_QUEUED;
}
static void fio_posixaio_cleanup(struct thread_data *td)
}
static void fio_posixaio_cleanup(struct thread_data *td)
@@
-164,7
+184,6
@@
static void fio_posixaio_cleanup(struct thread_data *td)
if (pd) {
free(pd->aio_events);
free(pd);
if (pd) {
free(pd->aio_events);
free(pd);
- td->io_ops->data = NULL;
}
}
}
}
@@
-173,8
+192,8
@@
static int fio_posixaio_init(struct thread_data *td)
struct posixaio_data *pd = malloc(sizeof(*pd));
memset(pd, 0, sizeof(*pd));
struct posixaio_data *pd = malloc(sizeof(*pd));
memset(pd, 0, sizeof(*pd));
- pd->aio_events = malloc(td->iodepth * sizeof(struct io_u *));
- memset(pd->aio_events, 0, td->iodepth * sizeof(struct io_u *));
+ pd->aio_events = malloc(td->
o.
iodepth * sizeof(struct io_u *));
+ memset(pd->aio_events, 0, td->
o.
iodepth * sizeof(struct io_u *));
td->io_ops->data = pd;
return 0;
td->io_ops->data = pd;
return 0;
@@
-190,6
+209,8
@@
static struct ioengine_ops ioengine = {
.getevents = fio_posixaio_getevents,
.event = fio_posixaio_event,
.cleanup = fio_posixaio_cleanup,
.getevents = fio_posixaio_getevents,
.event = fio_posixaio_event,
.cleanup = fio_posixaio_cleanup,
+ .open_file = generic_open_file,
+ .close_file = generic_close_file,
};
#else /* FIO_HAVE_POSIXAIO */
};
#else /* FIO_HAVE_POSIXAIO */