summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-09-02 20:39:45 +0000
committerLennart Poettering <lennart@poettering.net>2007-09-02 20:39:45 +0000
commitca059ab9ef18918dd486e899482327ce157eb629 (patch)
tree82374f0fbcf8d89c9fa7f07b1ca7ea058cce2f89
parent3e188b192c6470a0749bed4b01aad99faca4478a (diff)
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
-rw-r--r--src/daemon/daemon-conf.c4
-rw-r--r--src/daemon/daemon.conf.in4
-rw-r--r--src/daemon/main.c5
3 files changed, 8 insertions, 5 deletions
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index e3ad8b3f..7b503f83 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -86,13 +86,13 @@ static const pa_daemon_conf default_conf = {
.rlimit_core = { .value = 0, .is_set = 0 },
.rlimit_data = { .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 }
#ifdef RLIMIT_NPROC
, .rlimit_nproc = { .value = 0, .is_set = 0 }
#endif
#ifdef RLIMIT_MEMLOCK
- , .rlimit_memlock = { .value = 0, .is_set = 1 }
+ , .rlimit_memlock = { .value = 16384, .is_set = 1 }
#endif
#endif
};
diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index 9bd5cba6..2132bf3d 100644
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -92,10 +92,10 @@
; rlimit-core = -1
; rlimit-data = -1
; rlimit-fsize = -1
-; rlimit-nofile = 200
+; rlimit-nofile = 256
; rlimit-stack = -1
; rlimit-nproc = -1
-; rlimit-memlock = 25
+; rlimit-memlock = 16384
## Disable shared memory data transfer
; disable-shm = 0
diff --git a/src/daemon/main.c b/src/daemon/main.c
index b927b2af..639d6dc9 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -80,6 +80,7 @@
#include <pulsecore/random.h>
#include <pulsecore/rtsig.h>
#include <pulsecore/rtclock.h>
+#include <pulsecore/macro.h>
#include "cmdline.h"
#include "cpulimit.h"
@@ -584,8 +585,10 @@ int main(int argc, char *argv[]) {
signal(SIGPIPE, SIG_IGN);
#endif
+ pa_log_info("Page size is %lu bytes", (unsigned long) PA_PAGE_SIZE);
+
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
pa_log_info("Dude, your kernel stinks! The chef's recommendation today is Linux with high-resolution timers enabled!");