Don't set RLIMIT_MEMBLOCK to 0 on startup. Retain 4 pages

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1749 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-09-02 20:39:45 +00:00
parent 3e188b192c
commit ca059ab9ef
3 changed files with 8 additions and 5 deletions

View file

@ -86,13 +86,13 @@ static const pa_daemon_conf default_conf = {
.rlimit_core = { .value = 0, .is_set = 0 }, .rlimit_core = { .value = 0, .is_set = 0 },
.rlimit_data = { .value = 0, .is_set = 0 }, .rlimit_data = { .value = 0, .is_set = 0 },
.rlimit_fsize = { .value = 0, .is_set = 0 }, .rlimit_fsize = { .value = 0, .is_set = 0 },
.rlimit_nofile = { .value = 200, .is_set = 1 }, .rlimit_nofile = { .value = 256, .is_set = 1 },
.rlimit_stack = { .value = 0, .is_set = 0 } .rlimit_stack = { .value = 0, .is_set = 0 }
#ifdef RLIMIT_NPROC #ifdef RLIMIT_NPROC
, .rlimit_nproc = { .value = 0, .is_set = 0 } , .rlimit_nproc = { .value = 0, .is_set = 0 }
#endif #endif
#ifdef RLIMIT_MEMLOCK #ifdef RLIMIT_MEMLOCK
, .rlimit_memlock = { .value = 0, .is_set = 1 } , .rlimit_memlock = { .value = 16384, .is_set = 1 }
#endif #endif
#endif #endif
}; };

View file

@ -92,10 +92,10 @@
; rlimit-core = -1 ; rlimit-core = -1
; rlimit-data = -1 ; rlimit-data = -1
; rlimit-fsize = -1 ; rlimit-fsize = -1
; rlimit-nofile = 200 ; rlimit-nofile = 256
; rlimit-stack = -1 ; rlimit-stack = -1
; rlimit-nproc = -1 ; rlimit-nproc = -1
; rlimit-memlock = 25 ; rlimit-memlock = 16384
## Disable shared memory data transfer ## Disable shared memory data transfer
; disable-shm = 0 ; disable-shm = 0

View file

@ -80,6 +80,7 @@
#include <pulsecore/random.h> #include <pulsecore/random.h>
#include <pulsecore/rtsig.h> #include <pulsecore/rtsig.h>
#include <pulsecore/rtclock.h> #include <pulsecore/rtclock.h>
#include <pulsecore/macro.h>
#include "cmdline.h" #include "cmdline.h"
#include "cpulimit.h" #include "cpulimit.h"
@ -584,8 +585,10 @@ int main(int argc, char *argv[]) {
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
#endif #endif
pa_log_info("Page size is %lu bytes", (unsigned long) PA_PAGE_SIZE);
if (pa_rtclock_hrtimer()) if (pa_rtclock_hrtimer())
pa_log_debug("Fresh high-resolution timers available! Bon appetit!"); pa_log_info("Fresh high-resolution timers available! Bon appetit!");
else else
pa_log_info("Dude, your kernel stinks! The chef's recommendation today is Linux with high-resolution timers enabled!"); pa_log_info("Dude, your kernel stinks! The chef's recommendation today is Linux with high-resolution timers enabled!");