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

FS-11706 [core] use unique mutex for stack_count

Browse Source
This commit is contained in:
Chris Rienzo 2019-03-20 00:58:10 +00:00 committed by Chris Rienzo
parent d86c715694
commit c40af77327
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/private/switch_core_pvt.h
View File

@ -129,6 +129,7 @@ struct switch_core_session {
switch_audio_resampler_t *write_resampler; switch_audio_resampler_t *write_resampler;
switch_mutex_t *mutex; switch_mutex_t *mutex;
switch_mutex_t *stack_count_mutex;
switch_mutex_t *resample_mutex; switch_mutex_t *resample_mutex;
switch_mutex_t *codec_read_mutex; switch_mutex_t *codec_read_mutex;
switch_mutex_t *codec_write_mutex; switch_mutex_t *codec_write_mutex;

5
src/switch_core_session.c
View File

@ -2404,6 +2404,7 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_uuid(switch_
session->enc_read_frame.buflen = sizeof(session->enc_read_buf); session->enc_read_frame.buflen = sizeof(session->enc_read_buf);
switch_mutex_init(&session->mutex, SWITCH_MUTEX_NESTED, session->pool); switch_mutex_init(&session->mutex, SWITCH_MUTEX_NESTED, session->pool);
switch_mutex_init(&session->stack_count_mutex, SWITCH_MUTEX_NESTED, session->pool);
switch_mutex_init(&session->resample_mutex, SWITCH_MUTEX_NESTED, session->pool); switch_mutex_init(&session->resample_mutex, SWITCH_MUTEX_NESTED, session->pool);
switch_mutex_init(&session->codec_read_mutex, SWITCH_MUTEX_NESTED, session->pool); switch_mutex_init(&session->codec_read_mutex, SWITCH_MUTEX_NESTED, session->pool);
switch_mutex_init(&session->codec_write_mutex, SWITCH_MUTEX_NESTED, session->pool); switch_mutex_init(&session->codec_write_mutex, SWITCH_MUTEX_NESTED, session->pool);
@ -2906,12 +2907,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_exec(switch_core_session_t *
SWITCH_DECLARE(uint32_t) switch_core_session_stack_count(switch_core_session_t *session, int x) SWITCH_DECLARE(uint32_t) switch_core_session_stack_count(switch_core_session_t *session, int x)
{ {
uint32_t stack_count = 0; uint32_t stack_count = 0;
switch_mutex_lock(session->mutex); switch_mutex_lock(session->stack_count_mutex);
if (x > 0) session->stack_count++; if (x > 0) session->stack_count++;
else if (x < 0) session->stack_count--; else if (x < 0) session->stack_count--;
stack_count = session->stack_count; stack_count = session->stack_count;
switch_mutex_unlock(session->mutex); switch_mutex_unlock(session->stack_count_mutex);
return stack_count; return stack_count;
} }