]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Revert "FS-10299 [mod_callcenter] Removing global lock on all cc_execute_sql function...
authorAntonio <asilva@wirelessmundi.com>
Fri, 23 Jun 2017 17:02:39 +0000 (19:02 +0200)
committerAntonio <asilva@wirelessmundi.com>
Fri, 23 Jun 2017 17:02:39 +0000 (19:02 +0200)
This reverts commit faf87febdb5a90f7c339df6934fd7eb04c927b67.

src/mod/applications/mod_callcenter/mod_callcenter.c

index 656af706ebfcebf2497cafb840fe1fc8b6c84a09..7c45d6eaf35d3a7ee98e1ae534b9ab96ac0dd1dd 100644 (file)
@@ -601,6 +601,8 @@ 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())) {
@@ -615,6 +617,8 @@ end:
 
        if (mutex) {
                switch_mutex_unlock(mutex);
+       } else {
+               switch_mutex_unlock(globals.mutex);
        }
 
        return ret;
@@ -627,6 +631,8 @@ 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())) {
@@ -642,6 +648,8 @@ end:
 
        if (mutex) {
                switch_mutex_unlock(mutex);
+       } else {
+               switch_mutex_unlock(globals.mutex);
        }
 
        return status;
@@ -655,6 +663,8 @@ 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())) {
@@ -675,6 +685,8 @@ end:
 
        if (mutex) {
                switch_mutex_unlock(mutex);
+       } else {
+               switch_mutex_unlock(globals.mutex);
        }
 
        return ret;