kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-27 19:53:55 +00:00
Code Issues Projects Releases Wiki Activity

FS-10038: [core] tune heartbeat events interval

Browse Source 
Conflicts:
	src/switch_core.c
This commit is contained in:
Razvan Crainea 2017-02-14 13:41:52 +02:00 committed by Mike Jerris
parent 247131a1be
commit 4ebca9551b
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/vanilla/autoload_configs/switch.conf.xml
View File

@ -48,6 +48,9 @@
<!-- Minimum idle CPU before refusing calls --> <!-- Minimum idle CPU before refusing calls -->
<!-- <param name="min-idle-cpu" value="25"/> --> <!-- <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. Max number of sessions to allow at any given time.

1
src/include/private/switch_core_pvt.h
View File

@ -290,6 +290,7 @@ struct switch_runtime {
int multiple_registrations; int multiple_registrations;
uint32_t max_db_handles; uint32_t max_db_handles;
uint32_t db_handle_timeout; uint32_t db_handle_timeout;
uint32_t event_heartbeat_interval;
int cpu_count; int cpu_count;
uint32_t time_sync; uint32_t time_sync;
char *core_db_pre_trans_execute; char *core_db_pre_trans_execute;

13
src/switch_core.c
View File

@ -205,7 +205,7 @@ SWITCH_STANDARD_SCHED_FUNC(heartbeat_callback)
send_heartbeat(); send_heartbeat();
/* reschedule this task */ /* 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.max_db_handles = 50;
runtime.db_handle_timeout = 5000000; runtime.db_handle_timeout = 5000000;
runtime.event_heartbeat_interval = 20;
runtime.runlevel++; runtime.runlevel++;
runtime.dummy_cng_frame.data = runtime.dummy_data; runtime.dummy_cng_frame.data = runtime.dummy_data;
runtime.dummy_cng_frame.datalen = sizeof(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 { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "db-handle-timeout must be between 1 and 5000\n"); 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")) { } else if (!strcasecmp(var, "multiple-registrations")) {
runtime.multiple_registrations = switch_true(val); runtime.multiple_registrations = switch_true(val);
} else if (!strcasecmp(var, "auto-create-schemas")) { } else if (!strcasecmp(var, "auto-create-schemas")) {