From 4ebca9551b06287661032b39313f3fca7a2e6c90 Mon Sep 17 00:00:00 2001
From: Razvan Crainea <razvan@opensips.org>
Date: Tue, 14 Feb 2017 13:41:52 +0200
Subject: [PATCH] FS-10038: [core] tune heartbeat events interval

Conflicts:
	src/switch_core.c
---
 conf/vanilla/autoload_configs/switch.conf.xml |  3 +++
 src/include/private/switch_core_pvt.h         |  1 +
 src/switch_core.c                             | 13 ++++++++++---
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/conf/vanilla/autoload_configs/switch.conf.xml b/conf/vanilla/autoload_configs/switch.conf.xml
index 345a16c19e..ababe548ac 100644
--- a/conf/vanilla/autoload_configs/switch.conf.xml
+++ b/conf/vanilla/autoload_configs/switch.conf.xml
@@ -48,6 +48,9 @@
     <!-- Minimum idle CPU before refusing calls -->
     <!-- <param name="min-idle-cpu" value="25"/> -->
 
+    <!-- Interval between heartbeat events -->
+    <!-- <param name="event-heartbeat-interval" value="20"/> -->
+
     <!--
 	Max number of sessions to allow at any given time.
 	
diff --git a/src/include/private/switch_core_pvt.h b/src/include/private/switch_core_pvt.h
index 4204fcd0d5..7f6b2aa73c 100644
--- a/src/include/private/switch_core_pvt.h
+++ b/src/include/private/switch_core_pvt.h
@@ -290,6 +290,7 @@ struct switch_runtime {
 	int multiple_registrations;
 	uint32_t max_db_handles;
 	uint32_t db_handle_timeout;
+	uint32_t event_heartbeat_interval;
 	int cpu_count;
 	uint32_t time_sync;
 	char *core_db_pre_trans_execute;
diff --git a/src/switch_core.c b/src/switch_core.c
index f733464c7f..0a3a4a4042 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -205,7 +205,7 @@ SWITCH_STANDARD_SCHED_FUNC(heartbeat_callback)
 	send_heartbeat();
 
 	/* reschedule this task */
-	task->runtime = switch_epoch_time_now(NULL) + 20;
+	task->runtime = switch_epoch_time_now(NULL) + runtime.event_heartbeat_interval;
 }
 
 
@@ -1825,7 +1825,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
 
 	runtime.max_db_handles = 50;
 	runtime.db_handle_timeout = 5000000;
-	
+	runtime.event_heartbeat_interval = 20;
 	runtime.runlevel++;
 	runtime.dummy_cng_frame.data = runtime.dummy_data;
 	runtime.dummy_cng_frame.datalen = sizeof(runtime.dummy_data);
@@ -2138,7 +2138,14 @@ static void switch_load_core_config(const char *file)
 					} else {
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "db-handle-timeout must be between 1 and 5000\n");
 					}
-					
+				} else if (!strcasecmp(var, "event-heartbeat-interval")) {
+					long tmp = atol(val);
+
+					if (tmp > 0) {
+						runtime.event_heartbeat_interval = (uint32_t) tmp;
+					} else {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "heartbeat-interval must be a greater than 0\n");
+					}
 				} else if (!strcasecmp(var, "multiple-registrations")) {
 					runtime.multiple_registrations = switch_true(val);
 				} else if (!strcasecmp(var, "auto-create-schemas")) {