projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix a weird check of the return value of aio_cancel.
[fio.git]
/
engines
/
posixaio.c
diff --git
a/engines/posixaio.c
b/engines/posixaio.c
index ddc75d1cfe54802c8c0ac09349930ed852e5a52a..7098d72677428d2dc314eb550f34129566ddc533 100644
(file)
--- a/
engines/posixaio.c
+++ b/
engines/posixaio.c
@@
-8,7
+8,7
@@
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
-#include <
assert
.h>
+#include <
fcntl
.h>
#include "../fio.h"
#include "../fio.h"
@@
-16,6
+16,7
@@
struct posixaio_data {
struct io_u **aio_events;
struct posixaio_data {
struct io_u **aio_events;
+ unsigned int queued;
};
static int fill_timespec(struct timespec *ts)
};
static int fill_timespec(struct timespec *ts)
@@
-55,7
+56,7
@@
static int fio_posixaio_cancel(struct thread_data fio_unused *td,
struct fio_file *f = io_u->file;
int r = aio_cancel(f->fd, &io_u->aiocb);
struct fio_file *f = io_u->file;
int r = aio_cancel(f->fd, &io_u->aiocb);
- if (r ==
1
|| r == AIO_CANCELED)
+ if (r ==
AIO_ALLDONE
|| r == AIO_CANCELED)
return 0;
return 1;
return 0;
return 1;
@@
-83,7
+84,7
@@
static int fio_posixaio_getevents(struct thread_data *td, unsigned int min,
{
struct posixaio_data *pd = td->io_ops->data;
struct aiocb *suspend_list[SUSPEND_ENTRIES];
{
struct posixaio_data *pd = td->io_ops->data;
struct aiocb *suspend_list[SUSPEND_ENTRIES];
- struct list_head *entry;
+ struct
f
list_head *entry;
struct timespec start;
int have_timeout = 0;
int suspend_entries = 0;
struct timespec start;
int have_timeout = 0;
int suspend_entries = 0;
@@
-95,8
+96,8
@@
static int fio_posixaio_getevents(struct thread_data *td, unsigned int min,
r = 0;
memset(suspend_list, 0, sizeof(*suspend_list));
restart:
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);
+
f
list_for_each(entry, &td->io_u_busylist) {
+ struct io_u *io_u =
f
list_entry(entry, struct io_u, list);
int err;
if (io_u->seen)
int err;
if (io_u->seen)
@@
-112,6
+113,7
@@
restart:
}
io_u->seen = 1;
}
io_u->seen = 1;
+ pd->queued--;
pd->aio_events[r++] = io_u;
if (err == ECANCELED)
pd->aio_events[r++] = io_u;
if (err == ECANCELED)
@@
-156,6
+158,7
@@
static struct io_u *fio_posixaio_event(struct thread_data *td, int event)
static int fio_posixaio_queue(struct thread_data fio_unused *td,
struct io_u *io_u)
{
static int fio_posixaio_queue(struct thread_data fio_unused *td,
struct io_u *io_u)
{
+ struct posixaio_data *pd = td->io_ops->data;
struct aiocb *aiocb = &io_u->aiocb;
int ret;
struct aiocb *aiocb = &io_u->aiocb;
int ret;
@@
-165,15
+168,25
@@
static int fio_posixaio_queue(struct thread_data fio_unused *td,
ret = aio_read(aiocb);
else if (io_u->ddir == DDIR_WRITE)
ret = aio_write(aiocb);
ret = aio_read(aiocb);
else if (io_u->ddir == DDIR_WRITE)
ret = aio_write(aiocb);
- else
+ else {
+#ifdef FIO_HAVE_POSIXAIO_FSYNC
ret = aio_fsync(O_SYNC, aiocb);
ret = aio_fsync(O_SYNC, aiocb);
+#else
+ if (pd->queued)
+ return FIO_Q_BUSY;
+ do_io_u_sync(td, io_u);
+ return FIO_Q_COMPLETED;
+#endif
+ }
+
if (ret) {
io_u->error = errno;
td_verror(td, io_u->error, "xfer");
return FIO_Q_COMPLETED;
}
if (ret) {
io_u->error = errno;
td_verror(td, io_u->error, "xfer");
return FIO_Q_COMPLETED;
}
+ pd->queued++;
return FIO_Q_QUEUED;
}
return FIO_Q_QUEUED;
}
@@
-184,7
+197,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;
}
}
}
}
@@
-212,6
+224,7
@@
static struct ioengine_ops ioengine = {
.cleanup = fio_posixaio_cleanup,
.open_file = generic_open_file,
.close_file = generic_close_file,
.cleanup = fio_posixaio_cleanup,
.open_file = generic_open_file,
.close_file = generic_close_file,
+ .get_file_size = generic_get_file_size,
};
#else /* FIO_HAVE_POSIXAIO */
};
#else /* FIO_HAVE_POSIXAIO */