X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fsolarisaio.c;h=d499f5749ffd7fb51e0b55e881162bc38e43fa59;hb=02444ad1868ee94c7c38810cc775784e6a9a5dbe;hp=dfaa375a1e0aa6a06c91d97a6e54d93d9fb87041;hpb=44c47feb9edc7854bf3cfa2e3d843e90fc969b3a;p=fio.git diff --git a/engines/solarisaio.c b/engines/solarisaio.c index dfaa375a..d499f574 100644 --- a/engines/solarisaio.c +++ b/engines/solarisaio.c @@ -74,11 +74,6 @@ static void wait_for_event(struct timeval *tv) 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) { @@ -164,17 +159,22 @@ static void fio_solarisaio_cleanup(struct thread_data *td) /* * 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;