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 smgmaster

Browse Source
This commit is contained in:
Konrad Hammel
2011-03-15 10:53:35 -04:00
parent f3d8dc8ad3 37139badf7
commit c58a3db915
156 changed files with 6210 additions and 4304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/switch.c
+11 -3
View File
@@ -404,7 +404,8 @@ int main(int argc, char *argv[])
#endif
"\t-help -- this message\n" "\t-version -- print the version and exit\n"
#ifdef HAVE_SETRLIMIT
"\t-waste -- allow memory waste\n" "\t-core -- dump cores\n"
"\t-waste -- allow memory waste\n"
"\t-core -- dump cores\n"
#endif
"\t-hp -- enable high priority settings\n"
"\t-vg -- run under valgrind\n"
@@ -553,6 +554,13 @@ int main(int argc, char *argv[])
}
if (local_argv[x] && !strcmp(local_argv[x], "-waste")) {
fprintf(stderr, "WARNING: Wasting up to 8 megs of memory per thread.\n");
sleep(2);
waste++;
known_opt++;
}
if (local_argv[x] && !strcmp(local_argv[x], "-no-auto-stack")) {
waste++;
known_opt++;
}
@@ -788,8 +796,8 @@ int main(int argc, char *argv[])
char buf[1024] = "";
int i = 0;
fprintf(stderr, "Error: stacksize %d is too large: run ulimit -s %d or run %s -waste.\nauto-adjusting stack size for optimal performance...\n",
(int) (rlp.rlim_max / 1024), SWITCH_THREAD_STACKSIZE / 1024, local_argv[0]);
fprintf(stderr, "Error: stacksize %d is too large: run ulimit -s %d from your shell before starting the application.\nauto-adjusting stack size for optimal performance...\n",
(int) (rlp.rlim_max / 1024), SWITCH_THREAD_STACKSIZE / 1024);
memset(&rlp, 0, sizeof(rlp));
rlp.rlim_cur = SWITCH_THREAD_STACKSIZE;