ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 05:02:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into releases.3.5

Browse Source
This commit is contained in:
David Yat Sin
2012-04-03 18:16:36 -04:00
parent fbc5322e65 27e4cdb4dd
commit e3369119e0
940 changed files with 118344 additions and 11720 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/switch_core.c
+30 -2
View File
@@ -727,6 +727,11 @@ SWITCH_DECLARE(int32_t) set_realtime_priority(void)
return 0;
}
SWITCH_DECLARE(uint32_t) switch_core_cpu_count(void)
{
return runtime.cpu_count;
}
SWITCH_DECLARE(int32_t) set_normal_priority(void)
{
return 0;
@@ -736,12 +741,17 @@ SWITCH_DECLARE(int32_t) set_auto_priority(void)
{
#ifndef WIN32
runtime.cpu_count = sysconf (_SC_NPROCESSORS_ONLN);
#else
SYSTEM_INFO sysinfo;
GetSystemInfo( &sysinfo );
runtime.cpu_count = sysinfo.dwNumberOfProcessors;
#endif
/* If we have more than 1 cpu, we should use realtime priority so we can have priority threads */
if (runtime.cpu_count > 1) {
return set_realtime_priority();
}
#endif
return 0;
}
@@ -1406,6 +1416,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
runtime.dbname = NULL;
#ifndef WIN32
runtime.cpu_count = sysconf (_SC_NPROCESSORS_ONLN);
#else
{
SYSTEM_INFO sysinfo;
GetSystemInfo( &sysinfo );
runtime.cpu_count = sysinfo.dwNumberOfProcessors;
}
#endif
/* INIT APR and Create the pool context */
@@ -1878,6 +1894,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(switch_core_flag_t
runtime.runlevel++;
switch_core_set_signal_handlers();
switch_load_network_lists(SWITCH_FALSE);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Bringing up environment.\n");
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Loading Modules.\n");
@@ -1887,7 +1904,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(switch_core_flag_t
return SWITCH_STATUS_GENERR;
}
switch_load_network_lists(SWITCH_FALSE);
switch_load_core_config("post_load_switch.conf");
@@ -2017,6 +2034,17 @@ SWITCH_DECLARE(int32_t) switch_core_session_ctl(switch_session_ctl_t cmd, void *
}
switch (cmd) {
case SCSC_DEBUG_SQL:
{
if (switch_test_flag((&runtime), SCF_DEBUG_SQL)) {
switch_clear_flag((&runtime), SCF_DEBUG_SQL);
newintval = 0;
} else {
switch_set_flag((&runtime), SCF_DEBUG_SQL);
newintval = 1;
}
}
break;
case SCSC_VERBOSE_EVENTS:
if (intval) {
if (oldintval > -1) {