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)
{
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;
}
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;
}
/*
- * 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)
{
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;
.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 */
*/
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;
}