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

diff --git a/engines/solarisaio.c b/engines/solarisaio.c
index b519fc54..d499f574 100644
--- a/engines/solarisaio.c
+++ b/engines/solarisaio.c
@@ -69,15 +69,11 @@ static void wait_for_event(struct timeval *tv)
 	 * 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;
 }
 
@@ -161,20 +157,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 +193,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;