On 09/01/19 12:01, Stefan Hajnoczi wrote: > g_free(data); > + > + tgm->restart_pending--; > + aio_wait_kick(); > } > > static void throttle_group_restart_queue(ThrottleGroupMember *tgm, bool > is_write) > @@ -430,6 +433,8 @@ static void > throttle_group_restart_queue(ThrottleGroupMember *tgm, bool is_write > * be no timer pending on this tgm at this point */ > assert(!timer_pending(tgm->throttle_timers.timers[is_write])); > > + tgm->restart_pending++; > + > co = qemu_coroutine_create(throttle_group_restart_queue_entry, rd); > aio_co_enter(tgm->aio_context, co); > } > @@ -538,6 +543,7 @@ void throttle_group_register_tgm(ThrottleGroupMember *tgm, > > tgm->throttle_state = ts; > tgm->aio_context = ctx; > + tgm->restart_pending = 0; > > qemu_mutex_lock(&tg->lock); > /* If the ThrottleGroup is new set this ThrottleGroupMember as the token > */ > @@ -584,6 +590,9 @@ void throttle_group_unregister_tgm(ThrottleGroupMember > *tgm) > return; > } > > + /* Wait for throttle_group_restart_queue_entry() coroutines to finish */ > + AIO_WAIT_WHILE(tgm->aio_context, tgm->restart_pending > 0); > +
Could you change this to atomic_inc/dec, and atomic_read here? It would be nice to avoid more uses of the AioContext lock. Paolo
