From 80cce9c69b0075549f08d898084d4f242aa9c3f8 Mon Sep 17 00:00:00 2001
From: sharmilas2704 <sharmilas7711@gmail.com>
Date: Fri, 29 Jul 2022 23:59:46 +0530
Subject: [PATCH] Added global-db-lock setting in mod_sofia

---
 conf/vanilla/autoload_configs/sofia.conf.xml |  1 +
 src/mod/endpoints/mod_sofia/mod_sofia.h      |  1 +
 src/mod/endpoints/mod_sofia/sofia.c          |  4 ++
 src/mod/endpoints/mod_sofia/sofia_glue.c     | 58 ++++++++++++++------
 4 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/conf/vanilla/autoload_configs/sofia.conf.xml b/conf/vanilla/autoload_configs/sofia.conf.xml
index 629a0019fa..d80c5adae8 100644
--- a/conf/vanilla/autoload_configs/sofia.conf.xml
+++ b/conf/vanilla/autoload_configs/sofia.conf.xml
@@ -5,6 +5,7 @@
     <!-- <param name="abort-on-empty-external-ip" value="true"/> -->
     <!-- <param name="auto-restart" value="false"/> -->
     <param name="debug-presence" value="0"/>
+    <!-- <param name="global-db-lock" value="0"/>-->
     <!-- <param name="capture-server" value="udp:homer.domain.com:5060"/> -->
     
     <!-- 
diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h
index 9c4da13a67..1b92dd6283 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@@ -416,6 +416,7 @@ struct mod_sofia_globals {
 	const char *stir_shaken_vs_ca_dir;
 	int stir_shaken_vs_cert_path_check;
 	int stir_shaken_vs_require_date;
+	int global_db_lock;
 };
 extern struct mod_sofia_globals mod_sofia_globals;
 
diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 09d877527a..07c3fd7bf1 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -4502,6 +4502,7 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
 	mod_sofia_globals.auto_restart = SWITCH_TRUE;
 	mod_sofia_globals.reg_deny_binding_fetch_and_no_lookup = SWITCH_FALSE; /* handle backwards compatilibity - by default use new behavior */
 	mod_sofia_globals.rewrite_multicasted_fs_path = SWITCH_FALSE;
+	mod_sofia_globals.global_db_lock = SWITCH_TRUE;
 
 	if ((settings = switch_xml_child(cfg, "global_settings"))) {
 		for (param = switch_xml_child(settings, "param"); param; param = param->next) {
@@ -4517,6 +4518,9 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
 				mod_sofia_globals.debug_presence = atoi(val);
 			} else if (!strcasecmp(var, "debug-sla")) {
 				mod_sofia_globals.debug_sla = atoi(val);
+			} else if (!strcasecmp(var, "global-db-lock")) {
+				mod_sofia_globals.global_db_lock = switch_true(val);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "sofia global_db_lock : %d \n", mod_sofia_globals.global_db_lock);
 			} else if (!strcasecmp(var, "max-reg-threads") && val) {
 				int x = atoi(val);
 
diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index 955b75f899..e9e3a68e35 100644
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -2806,16 +2806,22 @@ void sofia_glue_actually_execute_sql_trans(sofia_profile_t *profile, char *sql,
 {
 	switch_cache_db_handle_t *dbh = NULL;
 
-	if (mutex) {
-		switch_mutex_lock(mutex);
+	if (mod_sofia_globals.global_db_lock) {
+		if (mutex) {
+			switch_mutex_lock(mutex);
+		}
 	}
 
 
 	if (!(dbh = sofia_glue_get_db_handle(profile))) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB\n");
 
+	if (mod_sofia_globals.global_db_lock) {
+		return;
+	} else {
 		goto end;
 	}
+	}
 
 	switch_cache_db_persistant_execute_trans_full(dbh, sql, 1,
 												  profile->pre_trans_execute,
@@ -2828,8 +2834,10 @@ void sofia_glue_actually_execute_sql_trans(sofia_profile_t *profile, char *sql,
 
  end:
 
-	if (mutex) {
-		switch_mutex_unlock(mutex);
+	if (mod_sofia_globals.global_db_lock) {
+		if (mutex) {
+			switch_mutex_unlock(mutex);
+		}
 	}
 }
 
@@ -2838,24 +2846,30 @@ void sofia_glue_actually_execute_sql(sofia_profile_t *profile, char *sql, switch
 	switch_cache_db_handle_t *dbh = NULL;
 	char *err = NULL;
 
-	if (mutex) {
-		switch_mutex_lock(mutex);
+	if (mod_sofia_globals.global_db_lock) {
+		if (mutex) {
+			switch_mutex_lock(mutex);
+		}
 	}
 
 	if (!(dbh = sofia_glue_get_db_handle(profile))) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB\n");
 
+	if (mod_sofia_globals.global_db_lock) {
 		if (mutex) {
 			switch_mutex_unlock(mutex);
 		}
+	}
 
 		return;
 	}
 
 	switch_cache_db_execute_sql(dbh, sql, &err);
 
-	if (mutex) {
-		switch_mutex_unlock(mutex);
+	if (mod_sofia_globals.global_db_lock) {
+		if (mutex) {
+			switch_mutex_unlock(mutex);
+		}
 	}
 
 	if (err) {
@@ -2873,24 +2887,30 @@ switch_bool_t sofia_glue_execute_sql_callback(sofia_profile_t *profile,
 	char *errmsg = NULL;
 	switch_cache_db_handle_t *dbh = NULL;
 
-	if (mutex) {
-		switch_mutex_lock(mutex);
+	if (mod_sofia_globals.global_db_lock) {
+		if (mutex) {
+			switch_mutex_lock(mutex);
+		}
 	}
 
 	if (!(dbh = sofia_glue_get_db_handle(profile))) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB\n");
 
+	if (mod_sofia_globals.global_db_lock) {
 		if (mutex) {
 			switch_mutex_unlock(mutex);
 		}
+	}
 
 		return ret;
 	}
 
 	switch_cache_db_execute_sql_callback(dbh, sql, callback, pdata, &errmsg);
 
-	if (mutex) {
-		switch_mutex_unlock(mutex);
+	if (mod_sofia_globals.global_db_lock) {
+		if (mutex) {
+			switch_mutex_unlock(mutex);
+		}
 	}
 
 	if (errmsg) {
@@ -2909,24 +2929,30 @@ char *sofia_glue_execute_sql2str(sofia_profile_t *profile, switch_mutex_t *mutex
 	char *err = NULL;
 	switch_cache_db_handle_t *dbh = NULL;
 
-	if (mutex) {
-		switch_mutex_lock(mutex);
+	if (mod_sofia_globals.global_db_lock) {
+		if (mutex) {
+			switch_mutex_lock(mutex);
+		}
 	}
 
 	if (!(dbh = sofia_glue_get_db_handle(profile))) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB\n");
 
+	if (mod_sofia_globals.global_db_lock) {
 		if (mutex) {
 			switch_mutex_unlock(mutex);
 		}
+	}
 
 		return NULL;
 	}
 
 	ret = switch_cache_db_execute_sql2str(dbh, sql, resbuf, len, &err);
 
-	if (mutex) {
-		switch_mutex_unlock(mutex);
+	if (mod_sofia_globals.global_db_lock) {
+		if (mutex) {
+			switch_mutex_unlock(mutex);
+		}
 	}
 
 	if (err) {