The following changes since commit b2cecdc28469f8042d6cc3d83d83b18086845f18:
fio:modify a deprecated parameter(change timeout to runtime) (2012-08-31 08:22:42 -0700)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Jens Axboe (1):
libaio: pass in 0 for queue depth if we can
engines/libaio.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
---
Diff of recent changes:
diff --git a/engines/libaio.c b/engines/libaio.c
index e4869aa..ad7903c 100644
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -255,11 +255,20 @@ 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));
- int err;
+ struct libaio_options *o = td->eo;
+ int err = 0;
memset(ld, 0, sizeof(*ld));
- err = io_queue_init(td->o.iodepth, &ld->aio_ctx);
+ /*
+ * First try passing in 0 for queue depth, since we don't
+ * care about the user ring. If that fails, the kernel is too old
+ * and we need the right depth.
+ */
+ if (!o->userspace_reap)
+ err = io_queue_init(0, &ld->aio_ctx);
+ if (o->userspace_reap || err == -EINVAL)
+ err = io_queue_init(td->o.iodepth, &ld->aio_ctx);
if (err) {
td_verror(td, -err, "io_queue_init");
log_err("fio: check /proc/sys/fs/aio-max-nr\n");
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
