]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-10299 [mod_callcenter] Removing global lock on all cc_execute_sql functions when...
authorItalo Rossi <italorossib@gmail.com>
Tue, 9 May 2017 14:44:30 +0000 (11:44 -0300)
committerItalo Rossi <italorossib@gmail.com>
Tue, 9 May 2017 14:44:30 +0000 (11:44 -0300)
src/mod/applications/mod_callcenter/mod_callcenter.c

index 98b6a5514e66e5a69b0572cbf3d4a6e73a27e94a..d3ab7a820fb3bfe7f94e0a9599af70f4cc16c1a2 100644 (file)
@@ -601,8 +601,6 @@ char *cc_execute_sql2str(cc_queue_t *queue, switch_mutex_t *mutex, char *sql, ch
 
        if (mutex) {
                switch_mutex_lock(mutex);
-       } else {
-               switch_mutex_lock(globals.mutex);
        }
 
        if (!(dbh = cc_get_db_handle())) {
@@ -617,8 +615,6 @@ end:
 
        if (mutex) {
                switch_mutex_unlock(mutex);
-       } else {
-               switch_mutex_unlock(globals.mutex);
        }
 
        return ret;
@@ -631,8 +627,6 @@ static switch_status_t cc_execute_sql(cc_queue_t *queue, char *sql, switch_mutex
 
        if (mutex) {
                switch_mutex_lock(mutex);
-       } else {
-               switch_mutex_lock(globals.mutex);
        }
 
        if (!(dbh = cc_get_db_handle())) {
@@ -648,8 +642,6 @@ end:
 
        if (mutex) {
                switch_mutex_unlock(mutex);
-       } else {
-               switch_mutex_unlock(globals.mutex);
        }
 
        return status;
@@ -663,8 +655,6 @@ static switch_bool_t cc_execute_sql_callback(cc_queue_t *queue, switch_mutex_t *
 
        if (mutex) {
                switch_mutex_lock(mutex);
-       } else {
-               switch_mutex_lock(globals.mutex);
        }
 
        if (!(dbh = cc_get_db_handle())) {
@@ -685,8 +675,6 @@ end:
 
        if (mutex) {
                switch_mutex_unlock(mutex);
-       } else {
-               switch_mutex_unlock(globals.mutex);
        }
 
        return ret;