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

Merge branch 'master' into smgmaster

Browse Source 
Conflicts:
	build/modules.conf.in
	libs/esl/fs_cli.c
This commit is contained in:
Moises Silva
2011-09-28 12:27:10 -04:00
parent d89f3afdc2 b004bcfc6d
commit ff3648ef21
406 changed files with 25830 additions and 41048 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/switch.c
+30 -9
View File
@@ -102,6 +102,7 @@ static void handle_SIGCHLD(int sig)
pid = wait(&status);
if (pid > 0) {
printf("ASS %d\n", pid);
system_ready = -1;
}
@@ -357,7 +358,7 @@ int main(int argc, char *argv[])
char *usageDesc;
int alt_dirs = 0, log_set = 0, run_set = 0, do_kill = 0;
int known_opt;
int high_prio = 0;
int priority = 0;
#ifndef WIN32
int do_wait = 0;
#endif
@@ -407,7 +408,9 @@ int main(int argc, char *argv[])
"\t-waste -- allow memory waste\n"
"\t-core -- dump cores\n"
#endif
"\t-hp -- enable high priority settings\n"
"\t-rp -- enable high(realtime) priority settings\n"
"\t-lp -- enable low priority settings\n"
"\t-np -- enable normal priority settings (system defaults)\n"
"\t-vg -- run under valgrind\n"
"\t-nosql -- disable internal sql scoreboard\n"
"\t-heavy-timer -- Heavy Timer, possibly more accurate but at a cost\n"
@@ -567,8 +570,18 @@ int main(int argc, char *argv[])
}
#endif
if (local_argv[x] && !strcmp(local_argv[x], "-hp")) {
high_prio++;
if (local_argv[x] && (!strcmp(local_argv[x], "-hp") || !strcmp(local_argv[x], "-rp"))) {
priority = 2;
known_opt++;
}
if (local_argv[x] && !strcmp(local_argv[x], "-lp")) {
priority = -1;
known_opt++;
}
if (local_argv[x] && !strcmp(local_argv[x], "-np")) {
priority = 1;
known_opt++;
}
@@ -844,13 +857,21 @@ int main(int argc, char *argv[])
}
if (high_prio) {
set_high_priority();
} else {
switch(priority) {
case 2:
set_realtime_priority();
break;
case 1:
set_normal_priority();
break;
case -1:
set_low_priority();
break;
default:
set_auto_priority();
break;
}
switch_core_setrlimits();