Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests Activity

refactor codec_destroy to prevent race

Browse Source
This commit is contained in:
Anthony Minessale 2010-11-19 11:16:18 -06:00
parent d2fd5ba0aa
commit 8c9f23ea56
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/switch_core_codec.c
View File

@ -672,14 +672,19 @@ SWITCH_DECLARE(switch_status_t) switch_core_codec_decode(switch_codec_t *codec,
SWITCH_DECLARE(switch_status_t) switch_core_codec_destroy(switch_codec_t *codec) SWITCH_DECLARE(switch_status_t) switch_core_codec_destroy(switch_codec_t *codec)
{ {
switch_mutex_t *mutex; switch_mutex_t *mutex = codec->mutex;
switch_memory_pool_t *pool; switch_memory_pool_t *pool = codec->memory_pool;
int free_pool = 0; int free_pool = 0;
switch_assert(codec != NULL); switch_assert(codec != NULL);
if (!switch_core_codec_ready(codec)) { if (mutex) switch_mutex_lock(mutex);
if (switch_core_codec_ready(codec)) {
switch_clear_flag(codec, SWITCH_CODEC_FLAG_READY);
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Codec is not initialized!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Codec is not initialized!\n");
if (mutex) switch_mutex_unlock(mutex);
return SWITCH_STATUS_NOT_INITALIZED; return SWITCH_STATUS_NOT_INITALIZED;
} }
@ -687,23 +692,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_codec_destroy(switch_codec_t *codec)
free_pool = 1; free_pool = 1;
} }
pool = codec->memory_pool;
mutex = codec->mutex;
if (mutex) {
switch_mutex_lock(mutex);
switch_clear_flag(codec, SWITCH_CODEC_FLAG_READY);
switch_mutex_unlock(mutex);
switch_mutex_lock(mutex);
}
codec->implementation->destroy(codec); codec->implementation->destroy(codec);
UNPROTECT_INTERFACE(codec->codec_interface); UNPROTECT_INTERFACE(codec->codec_interface);
if (mutex) { if (mutex) switch_mutex_unlock(mutex);
switch_mutex_unlock(mutex);
}
if (free_pool) { if (free_pool) {
switch_core_destroy_memory_pool(&pool); switch_core_destroy_memory_pool(&pool);