projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove io_u->endpos
[fio.git]
/
engines
/
libaio.c
diff --git
a/engines/libaio.c
b/engines/libaio.c
index 18dcf9ddfad59d753a2cf4b71061065dc6baf6fc..e452f1ca7c55f630c18c49186ece3f091713d0db 100644
(file)
--- a/
engines/libaio.c
+++ b/
engines/libaio.c
@@
-64,11
+64,11
@@
static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
unsigned int max, struct timespec *t)
{
struct libaio_data *ld = td->io_ops->data;
unsigned int max, struct timespec *t)
{
struct libaio_data *ld = td->io_ops->data;
-
long
r;
+
int
r;
do {
r = io_getevents(ld->aio_ctx, min, max, ld->aio_events, t);
do {
r = io_getevents(ld->aio_ctx, min, max, ld->aio_events, t);
- if (r >= min)
+ if (r >=
(int)
min)
break;
else if (r == -EAGAIN) {
usleep(100);
break;
else if (r == -EAGAIN) {
usleep(100);
@@
-186,14
+186,8
@@
static void fio_libaio_cleanup(struct thread_data *td)
static int fio_libaio_init(struct thread_data *td)
{
struct libaio_data *ld = malloc(sizeof(*ld));
static int fio_libaio_init(struct thread_data *td)
{
struct libaio_data *ld = malloc(sizeof(*ld));
- static int warn_print;
int err;
int err;
- if (td->o.iodepth > 1 && !td->o.odirect && !warn_print) {
- log_info("fio: libaio engine is only async for non-buffered IO\n");
- warn_print = 1;
- }
-
memset(ld, 0, sizeof(*ld));
err = io_queue_init(td->o.iodepth, &ld->aio_ctx);
memset(ld, 0, sizeof(*ld));
err = io_queue_init(td->o.iodepth, &ld->aio_ctx);
@@
-229,6
+223,7
@@
static struct ioengine_ops ioengine = {
.cleanup = fio_libaio_cleanup,
.open_file = generic_open_file,
.close_file = generic_close_file,
.cleanup = fio_libaio_cleanup,
.open_file = generic_open_file,
.close_file = generic_close_file,
+ .get_file_size = generic_get_file_size,
};
#else /* FIO_HAVE_LIBAIO */
};
#else /* FIO_HAVE_LIBAIO */