From 21223154aa3a3c794a3842aa8a5c85198ce85220 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 4 Nov 2010 21:51:02 +0100 Subject: output_control: lock object in audio_output_close() Protect the attributes "open" and "fail_timer". --- src/output_control.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) (limited to 'src/output_control.c') diff --git a/src/output_control.c b/src/output_control.c index 16c0dbb7..dd562f30 100644 --- a/src/output_control.c +++ b/src/output_control.c @@ -50,6 +50,20 @@ static void ao_command(struct audio_output *ao, enum audio_output_command cmd) ao_command_wait(ao); } +/** + * Like ao_command(), but assumes the object is locked by the caller. + */ +static void +ao_command_locked(struct audio_output *ao, enum audio_output_command cmd) +{ + assert(ao->command == AO_COMMAND_NONE); + ao->command = cmd; + + g_mutex_unlock(ao->mutex); + ao_command_wait(ao); + g_mutex_lock(ao->mutex); +} + static void ao_command_async(struct audio_output *ao, enum audio_output_command cmd) { @@ -162,21 +176,33 @@ void audio_output_cancel(struct audio_output *ao) ao_command_async(ao, AO_COMMAND_CANCEL); } -void audio_output_close(struct audio_output *ao) +static void +audio_output_close_locked(struct audio_output *ao) { + assert(ao != NULL); assert(!ao->open || ao->fail_timer == NULL); if (ao->mixer != NULL) mixer_auto_close(ao->mixer); if (ao->open) - ao_command(ao, AO_COMMAND_CLOSE); + ao_command_locked(ao, AO_COMMAND_CLOSE); else if (ao->fail_timer != NULL) { g_timer_destroy(ao->fail_timer); ao->fail_timer = NULL; } } +void audio_output_close(struct audio_output *ao) +{ + assert(ao != NULL); + assert(!ao->open || ao->fail_timer == NULL); + + g_mutex_lock(ao->mutex); + audio_output_close_locked(ao); + g_mutex_unlock(ao->mutex); +} + void audio_output_finish(struct audio_output *ao) { audio_output_close(ao); -- cgit v1.2.3 From 9562f667412dc620bed7299477c8a5bd86e399c4 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 4 Nov 2010 22:47:51 +0100 Subject: output_control: lock object in audio_output_open() Protect the attributes "open" and "fail_timer". --- src/output_control.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'src/output_control.c') diff --git a/src/output_control.c b/src/output_control.c index dd562f30..ecd22682 100644 --- a/src/output_control.c +++ b/src/output_control.c @@ -72,6 +72,12 @@ static void ao_command_async(struct audio_output *ao, notify_signal(&ao->notify); } +static void +audio_output_close_locked(struct audio_output *ao); + +/** + * Object must be locked (and unlocked) by the caller. + */ static bool audio_output_open(struct audio_output *ao, const struct audio_format *audio_format, @@ -98,7 +104,7 @@ audio_output_open(struct audio_output *ao, /* we're not using audio_output_cancel() here, because that function is asynchronous */ - ao_command(ao, AO_COMMAND_CANCEL); + ao_command_locked(ao, AO_COMMAND_CANCEL); } return true; @@ -109,7 +115,7 @@ audio_output_open(struct audio_output *ao, if (!ao->config_audio_format) { if (ao->open) - audio_output_close(ao); + audio_output_close_locked(ao); /* no audio format is configured: copy in->out, let the output's open() method determine the effective @@ -124,7 +130,7 @@ audio_output_open(struct audio_output *ao, open = ao->open; if (!open) { - ao_command(ao, AO_COMMAND_OPEN); + ao_command_locked(ao, AO_COMMAND_OPEN); open = ao->open; } @@ -141,12 +147,19 @@ audio_output_update(struct audio_output *ao, { assert(mp != NULL); + g_mutex_lock(ao->mutex); + if (ao->enabled) { if (ao->fail_timer == NULL || - g_timer_elapsed(ao->fail_timer, NULL) > REOPEN_AFTER) - return audio_output_open(ao, audio_format, mp); + g_timer_elapsed(ao->fail_timer, NULL) > REOPEN_AFTER) { + bool ret = audio_output_open(ao, audio_format, mp); + g_mutex_unlock(ao->mutex); + return ret; + } } else if (audio_output_is_open(ao)) - audio_output_close(ao); + audio_output_close_locked(ao); + + g_mutex_unlock(ao->mutex); return false; } -- cgit v1.2.3