summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Salveti de Araujo <ricardo.salveti@canonical.com>2014-07-01 08:12:59 +0200
committerTanu Kaskinen <tanu.kaskinen@linux.intel.com>2014-07-13 12:30:35 +0300
commit4ac62d46903c3f80cf73645d57ee072116371775 (patch)
tree8e4428891fad74f719d497fb3d50bec9537b97fd
parent273aee1cf590bdd253e8b22ae3a2a84b3b64f04b (diff)
daemon-conf: changing default rlimit_rttime value to 200 ms
Since rtkit v11, the top limit for rttime is 200 ms (previously it was wrongly limited to 2 seconds). Reviewed-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
-rw-r--r--src/daemon/daemon-conf.c2
-rw-r--r--src/daemon/daemon.conf.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index d0e177c88..b7a85aa17 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -139,7 +139,7 @@ static const pa_daemon_conf default_conf = {
,.rlimit_rtprio = { .value = 9, .is_set = true } /* One below JACK's default for the server */
#endif
#ifdef RLIMIT_RTTIME
- ,.rlimit_rttime = { .value = PA_USEC_PER_SEC, .is_set = true }
+ ,.rlimit_rttime = { .value = 200*PA_USEC_PER_MSEC, .is_set = true } /* rtkit's limit is 200 ms */
#endif
#endif
};
diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index 208905805..5b2013052 100644
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -75,7 +75,7 @@ ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl
; rlimit-msgqueue = -1
; rlimit-nice = 31
; rlimit-rtprio = 9
-; rlimit-rttime = 1000000
+; rlimit-rttime = 200000
])dnl
; default-sample-format = s16le