kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9355 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-08-22 19:00:56 +00:00
parent d5ffc98d43
commit 4dadffda00
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/switch_types.h
View File

@ -206,7 +206,8 @@ typedef enum {
SCF_USE_SQL = (1 << 0), SCF_USE_SQL = (1 << 0),
SCF_NO_NEW_SESSIONS = (1 << 1), SCF_NO_NEW_SESSIONS = (1 << 1),
SCF_SHUTTING_DOWN = (1 << 2), SCF_SHUTTING_DOWN = (1 << 2),
SCF_CRASH_PROT = (1 << 3) SCF_CRASH_PROT = (1 << 3),
SCF_VG = (1 << 4)
} switch_core_flag_enum_t; } switch_core_flag_enum_t;
typedef uint32_t switch_core_flag_t; typedef uint32_t switch_core_flag_t;

6
src/switch.c
View File

@ -236,6 +236,7 @@ int main(int argc, char *argv[])
"\t-core -- dump cores\n" "\t-core -- dump cores\n"
#endif #endif
"\t-hp -- enable high priority settings\n" "\t-hp -- enable high priority settings\n"
"\t-vg -- run under valgrind\n"
"\t-nosql -- disable internal sql scoreboard\n" "\t-nosql -- disable internal sql scoreboard\n"
"\t-stop -- stop freeswitch\n" "\t-stop -- stop freeswitch\n"
"\t-nc -- do not output to a console and background\n" "\t-nc -- do not output to a console and background\n"
@ -387,6 +388,11 @@ int main(int argc, char *argv[])
known_opt++; known_opt++;
} }
if (argv[x] && !strcmp(argv[x], "-vg")) {
flags |= SCF_VG;
known_opt++;
}
if (argv[x] && !strcmp(argv[x], "-stop")) { if (argv[x] && !strcmp(argv[x], "-stop")) {
die++; die++;
known_opt++; known_opt++;

5
src/switch_loadable_module.c
View File

@ -1109,8 +1109,9 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_init()
static void do_shutdown(switch_loadable_module_t *module, switch_bool_t shutdown, switch_bool_t unload) static void do_shutdown(switch_loadable_module_t *module, switch_bool_t shutdown, switch_bool_t unload)
{ {
int32_t flags = switch_core_flags();
switch_assert(module != NULL); switch_assert(module != NULL);
if (shutdown) { if (shutdown) {
switch_loadable_module_unprocess(module); switch_loadable_module_unprocess(module);
if (module->switch_module_shutdown) { if (module->switch_module_shutdown) {
@ -1121,7 +1122,7 @@ static void do_shutdown(switch_loadable_module_t *module, switch_bool_t shutdown
} }
} }
if (unload && module->status != SWITCH_STATUS_NOUNLOAD) { if (unload && module->status != SWITCH_STATUS_NOUNLOAD && !(flags & SCF_VG)) {
switch_memory_pool_t *pool; switch_memory_pool_t *pool;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s unloaded.\n", module->module_interface->module_name); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s unloaded.\n", module->module_interface->module_name);
switch_dso_unload(module->lib); switch_dso_unload(module->lib);