X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fsolarisaio.c;h=906a154a2eee3093274f3537cdf4bf40bcf1751c;hb=02efadeb8b05144bcf2fc7796e1da2e7db211d00;hp=b519fc54339b0ddde7fb3192db3b6afda9d9d64c;hpb=556e831d2b6e788fd48f724047d22ebb29676d42;p=fio.git

diff --git a/engines/solarisaio.c b/engines/solarisaio.c
index b519fc54..906a154a 100644
--- a/engines/solarisaio.c
+++ b/engines/solarisaio.c
@@ -62,22 +62,18 @@ static void wait_for_event(struct timeval *tv)
 		io_u->resid = io_u->xfer_buflen - io_u->resultp.aio_return;
 		io_u->error = 0;
 	} else
-		io_u->error = io_u->resultp.aio_return;
+		io_u->error = io_u->resultp.aio_errno;
 
 	/*
 	 * For SIGIO, we need a write barrier between the two, so that
 	 * the ->aio_pending store is seen after the ->aio_events store
 	 */
 	sd->aio_events[sd->aio_pending] = io_u;
+	write_barrier();
 	sd->aio_pending++;
 	sd->nr--;
 }
 
-static void fio_solarisaio_sigio(int sig)
-{
-	wait_for_event(NULL);
-}
-
 static int fio_solarisaio_getevents(struct thread_data *td, unsigned int min,
 				    unsigned int max, struct timespec *t)
 {
@@ -97,10 +93,10 @@ static int fio_solarisaio_getevents(struct thread_data *td, unsigned int min,
 		wait_for_event(&tv);
 
 	/*
-	 * Needs locking here for SIGIO
+	 * should be OK without locking, as int operations should be atomic
 	 */
 	ret = sd->aio_pending;
-	sd->aio_pending = 0;
+	sd->aio_pending -= ret;
 	return ret;
 }
 
@@ -130,6 +126,15 @@ static int fio_solarisaio_queue(struct thread_data fio_unused *td,
 		return FIO_Q_COMPLETED;
 	}
 
+	if (io_u->ddir == DDIR_DATASYNC) {
+		if (sd->nr)
+			return FIO_Q_BUSY;
+		if (fdatasync(f->fd) < 0)
+			io_u->error = errno;
+
+		return FIO_Q_COMPLETED;
+	}
+
 	if (sd->nr == sd->max_depth)
 		return FIO_Q_BUSY;
 
@@ -161,20 +166,24 @@ static void fio_solarisaio_cleanup(struct thread_data *td)
 }
 
 /*
- * Set USE_SIGNAL_COMPLETIONS to use SIGIO as completion events. Needs
- * locking around ->aio_pending and ->aio_events, see comment
+ * Set USE_SIGNAL_COMPLETIONS to use SIGIO as completion events.
  */
+#ifdef USE_SIGNAL_COMPLETIONS
+static void fio_solarisaio_sigio(int sig)
+{
+	wait_for_event(NULL);
+}
+
 static void fio_solarisaio_init_sigio(void)
 {
-#ifdef USE_SIGNAL_COMPLETIONS
 	struct sigaction act;
 
 	memset(&act, 0, sizeof(act));
 	act.sa_handler = fio_solarisaio_sigio;
 	act.sa_flags = SA_RESTART;
 	sigaction(SIGIO, &act, NULL);
-#endif
 }
+#endif
 
 static int fio_solarisaio_init(struct thread_data *td)
 {
@@ -193,7 +202,9 @@ static int fio_solarisaio_init(struct thread_data *td)
 	memset(sd->aio_events, 0, max_depth * sizeof(struct io_u *));
 	sd->max_depth = max_depth;
 
+#ifdef USE_SIGNAL_COMPLETIONS
 	fio_solarisaio_init_sigio();
+#endif
 
 	td->io_ops->data = sd;
 	return 0;
@@ -211,6 +222,7 @@ static struct ioengine_ops ioengine = {
 	.cleanup	= fio_solarisaio_cleanup,
 	.open_file	= generic_open_file,
 	.close_file	= generic_close_file,
+	.get_file_size	= generic_get_file_size,
 };
 
 #else /* FIO_HAVE_SOLARISAIO */
@@ -222,7 +234,7 @@ static struct ioengine_ops ioengine = {
  */
 static int fio_solarisaio_init(struct thread_data fio_unused *td)
 {
-	fprintf(stderr, "fio: solarisaio not available\n");
+	log_err("fio: solarisaio not available\n");
 	return 1;
 }