tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix stack rlimit problem 

fixes #6450
This commit is contained in:
Gunnar Beutner 2014-07-21 13:33:01 +02:00
parent 5436256ed7
commit 5dcf1a777b
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
lib/base/application.cpp
View File

@ -182,37 +182,42 @@ void Application::SetResourceLimits(void)
} }
} }
if (set_stack_rlimit) { if (getrlimit(RLIMIT_STACK, &rl) < 0) {
rl.rlim_cur = 1024 * 1024; Log(LogWarning, "Application", "Could not determine resource limit for stack size (RLIMIT_STACK)");
rl.rlim_max = rl.rlim_cur; rl.rlim_max = RLIM_INFINITY;
}
if (setrlimit(RLIMIT_STACK, &rl) < 0) if (set_stack_rlimit)
Log(LogNotice, "Application", "Could not adjust resource limit for stack size (RLIMIT_STACK)"); rl.rlim_cur = 256 * 1024;
else { else
char **new_argv = static_cast<char **>(malloc(sizeof(char *) * (argc + 2))); rl.rlim_cur = rl.rlim_max;
if (!new_argv) { if (setrlimit(RLIMIT_STACK, &rl) < 0)
perror("malloc"); Log(LogNotice, "Application", "Could not adjust resource limit for stack size (RLIMIT_STACK)");
exit(1); else if (set_stack_rlimit) {
} char **new_argv = static_cast<char **>(malloc(sizeof(char *) * (argc + 2)));
for (int i = 0; i < argc; i++)
new_argv[i] = argv[i];
new_argv[argc] = strdup("--no-stack-rlimit");
if (!new_argv[argc]) {
perror("strdup");
exit(1);
}
new_argv[argc + 1] = NULL;
if (execvp(new_argv[0], new_argv) < 0)
perror("execvp");
if (!new_argv) {
perror("malloc");
exit(1); exit(1);
} }
for (int i = 0; i < argc; i++)
new_argv[i] = argv[i];
new_argv[argc] = strdup("--no-stack-rlimit");
if (!new_argv[argc]) {
perror("strdup");
exit(1);
}
new_argv[argc + 1] = NULL;
if (execvp(new_argv[0], new_argv) < 0)
perror("execvp");
exit(1);
} }
# else /* RLIMIT_STACK */ # else /* RLIMIT_STACK */
Log(LogNotice, "Application", "System does not support adjusting the resource limit for stack size (RLIMIT_STACK)"); Log(LogNotice, "Application", "System does not support adjusting the resource limit for stack size (RLIMIT_STACK)");