X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Flibaio.c;h=439cd242dd9e0aab6df2ad65cda1daba35ee0140;hb=4aae38a645f3315ca2f8cc57a7ec4110ba7d8319;hp=eea8f55372ea17b59ad6e9e9c78006f963f63c54;hpb=5e00c2c4b7e2d5c1e535dbe10ee4b687f9f4b72b;p=fio.git

diff --git a/engines/libaio.c b/engines/libaio.c
index eea8f553..439cd242 100644
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -32,10 +32,8 @@ static int fio_libaio_prep(struct thread_data fio_unused *td, struct io_u *io_u)
 		io_prep_pread(&io_u->iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset);
 	else if (io_u->ddir == DDIR_WRITE)
 		io_prep_pwrite(&io_u->iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset);
-	else if (io_u->ddir == DDIR_SYNC)
+	else if (ddir_sync(io_u->ddir))
 		io_prep_fsync(&io_u->iocb, f->fd);
-	else
-		return 1;
 
 	return 0;
 }
@@ -64,11 +62,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;
-	long r;
+	int r;
 
 	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);
@@ -97,12 +95,19 @@ static int fio_libaio_queue(struct thread_data *td, struct io_u *io_u)
 	 * support aio fsync yet. So return busy for the case where we
 	 * have pending io, to let fio complete those first.
 	 */
-	if (io_u->ddir == DDIR_SYNC) {
+	if (ddir_sync(io_u->ddir)) {
 		if (ld->iocbs_nr)
 			return FIO_Q_BUSY;
-		if (fsync(io_u->file->fd) < 0)
-			io_u->error = errno;
 
+		do_io_u_sync(td, io_u);
+		return FIO_Q_COMPLETED;
+	}
+
+	if (io_u->ddir == DDIR_TRIM) {
+		if (ld->iocbs_nr)
+			return FIO_Q_BUSY;
+
+		do_io_u_trim(td, io_u);
 		return FIO_Q_COMPLETED;
 	}
 
@@ -118,6 +123,9 @@ static void fio_libaio_queued(struct thread_data *td, struct io_u **io_us,
 	struct timeval now;
 	unsigned int i;
 
+	if (!fio_fill_issue_time(td))
+		return;
+
 	fio_gettime(&now, NULL);
 
 	for (i = 0; i < nr; i++) {
@@ -144,13 +152,16 @@ static int fio_libaio_commit(struct thread_data *td)
 		ret = io_submit(ld->aio_ctx, ld->iocbs_nr, iocbs);
 		if (ret > 0) {
 			fio_libaio_queued(td, io_us, ret);
+			io_u_mark_submit(td, ret);
 			ld->iocbs_nr -= ret;
 			io_us += ret;
 			iocbs += ret;
 			ret = 0;
-		} else if (!ret || ret == -EAGAIN || ret == -EINTR)
+		} else if (!ret || ret == -EAGAIN || ret == -EINTR) {
+			if (!ret)
+				io_u_mark_submit(td, ret);
 			continue;
-		else
+		} else
 			break;
 	} while (ld->iocbs_nr);
 
@@ -174,26 +185,20 @@ static void fio_libaio_cleanup(struct thread_data *td)
 		free(ld->iocbs);
 		free(ld->io_us);
 		free(ld);
-		td->io_ops->data = NULL;
 	}
 }
 
 static int fio_libaio_init(struct thread_data *td)
 {
 	struct libaio_data *ld = malloc(sizeof(*ld));
-	static int warn_print;
 	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);
 	if (err) {
 		td_verror(td, -err, "io_queue_init");
+		log_err("fio: check /proc/sys/fs/aio-max-nr\n");
 		free(ld);
 		return 1;
 	}
@@ -223,6 +228,7 @@ static struct ioengine_ops ioengine = {
 	.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 */
@@ -234,7 +240,7 @@ static struct ioengine_ops ioengine = {
  */
 static int fio_libaio_init(struct thread_data fio_unused *td)
 {
-	fprintf(stderr, "fio: libaio not available\n");
+	log_err("fio: libaio not available\n");
 	return 1;
 }