kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-03 17:30:37 +00:00
Code Issues Projects Releases Wiki Activity

Revert "FS-10299 [mod_callcenter] Removing global lock on all cc_execute_sql functions when executing database queries"

Browse Source 
This reverts commit faf87febdb5a90f7c339df6934fd7eb04c927b67.
This commit is contained in:
Antonio 2017-06-23 19:02:39 +02:00 committed by Mike Jerris
parent 945710cc71
commit 2fae7089b2
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/applications/mod_callcenter/mod_callcenter.c
View File

@ -587,6 +587,8 @@ char *cc_execute_sql2str(cc_queue_t *queue, switch_mutex_t *mutex, char *sql, ch
if (mutex) { if (mutex) {
switch_mutex_lock(mutex); switch_mutex_lock(mutex);
} else {
switch_mutex_lock(globals.mutex);
} }
if (!(dbh = cc_get_db_handle())) { if (!(dbh = cc_get_db_handle())) {
@ -601,6 +603,8 @@ end:
if (mutex) { if (mutex) {
switch_mutex_unlock(mutex); switch_mutex_unlock(mutex);
} else {
switch_mutex_unlock(globals.mutex);
} }
return ret; return ret;
@ -613,6 +617,8 @@ static switch_status_t cc_execute_sql(cc_queue_t *queue, char *sql, switch_mutex
if (mutex) { if (mutex) {
switch_mutex_lock(mutex); switch_mutex_lock(mutex);
} else {
switch_mutex_lock(globals.mutex);
} }
if (!(dbh = cc_get_db_handle())) { if (!(dbh = cc_get_db_handle())) {
@ -628,6 +634,8 @@ end:
if (mutex) { if (mutex) {
switch_mutex_unlock(mutex); switch_mutex_unlock(mutex);
} else {
switch_mutex_unlock(globals.mutex);
} }
return status; return status;
@ -641,6 +649,8 @@ static switch_bool_t cc_execute_sql_callback(cc_queue_t *queue, switch_mutex_t *
if (mutex) { if (mutex) {
switch_mutex_lock(mutex); switch_mutex_lock(mutex);
} else {
switch_mutex_lock(globals.mutex);
} }
if (!(dbh = cc_get_db_handle())) { if (!(dbh = cc_get_db_handle())) {
@ -661,6 +671,8 @@ end:
if (mutex) { if (mutex) {
switch_mutex_unlock(mutex); switch_mutex_unlock(mutex);
} else {
switch_mutex_unlock(globals.mutex);
} }
return ret; return ret;