From 4b9b97841d0fc94ac53bc500b454211ed9319713 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sun, 4 Jul 2021 21:57:54 +0200 Subject: [PATCH] increase rt.limit from 200ms to 2seconds 200ms seems a little small, some plugins initialize themselves from the RT thread and get killed. 2 seconds seem to be a better default. The important part is that there is a limit so that runaway processes are killed and don't lock up the system. Fixes #1344 --- src/daemon/client-rt.conf.in | 4 ++-- src/daemon/filter-chain/demonic.conf | 4 ++-- src/daemon/filter-chain/sink-dolby-surround.conf | 4 ++-- src/daemon/filter-chain/sink-eq6.conf | 4 ++-- src/daemon/filter-chain/sink-matrix-spatialiser.conf | 4 ++-- src/daemon/filter-chain/source-rnnoise.conf | 4 ++-- src/daemon/jack.conf.in | 4 ++-- src/daemon/media-session.d/media-session.conf | 4 ++-- src/daemon/pipewire-pulse.conf.in | 4 ++-- src/daemon/pipewire.conf.in | 8 ++++---- src/modules/module-rt.c | 4 ++-- src/modules/module-rtkit.c | 4 ++-- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/daemon/client-rt.conf.in b/src/daemon/client-rt.conf.in index 6f4e9308c..d23883120 100644 --- a/src/daemon/client-rt.conf.in +++ b/src/daemon/client-rt.conf.in @@ -37,8 +37,8 @@ context.modules = [ args = { #nice.level = -11 #rt.prio = 88 - #rt.time.soft = 200000 - #rt.time.hard = 200000 + #rt.time.soft = 2000000 + #rt.time.hard = 2000000 } flags = [ ifexists nofail ] } diff --git a/src/daemon/filter-chain/demonic.conf b/src/daemon/filter-chain/demonic.conf index 74909a919..5da0141f4 100644 --- a/src/daemon/filter-chain/demonic.conf +++ b/src/daemon/filter-chain/demonic.conf @@ -24,8 +24,8 @@ context.modules = [ args = { #nice.level = -11 #rt.prio = 88 - #rt.time.soft = 200000 - #rt.time.hard = 200000 + #rt.time.soft = 2000000 + #rt.time.hard = 2000000 } flags = [ ifexists nofail ] } diff --git a/src/daemon/filter-chain/sink-dolby-surround.conf b/src/daemon/filter-chain/sink-dolby-surround.conf index 11b27f622..918fd9334 100644 --- a/src/daemon/filter-chain/sink-dolby-surround.conf +++ b/src/daemon/filter-chain/sink-dolby-surround.conf @@ -16,8 +16,8 @@ context.modules = [ args = { #nice.level = -11 #rt.prio = 88 - #rt.time.soft = 200000 - #rt.time.hard = 200000 + #rt.time.soft = 2000000 + #rt.time.hard = 2000000 } flags = [ ifexists nofail ] } diff --git a/src/daemon/filter-chain/sink-eq6.conf b/src/daemon/filter-chain/sink-eq6.conf index 5d7455309..6e6483d7a 100644 --- a/src/daemon/filter-chain/sink-eq6.conf +++ b/src/daemon/filter-chain/sink-eq6.conf @@ -16,8 +16,8 @@ context.modules = [ args = { #nice.level = -11 #rt.prio = 88 - #rt.time.soft = 200000 - #rt.time.hard = 200000 + #rt.time.soft = 2000000 + #rt.time.hard = 2000000 } flags = [ ifexists nofail ] } diff --git a/src/daemon/filter-chain/sink-matrix-spatialiser.conf b/src/daemon/filter-chain/sink-matrix-spatialiser.conf index 87d728c11..2419d9e69 100644 --- a/src/daemon/filter-chain/sink-matrix-spatialiser.conf +++ b/src/daemon/filter-chain/sink-matrix-spatialiser.conf @@ -17,8 +17,8 @@ context.modules = [ args = { #nice.level = -11 #rt.prio = 88 - #rt.time.soft = 200000 - #rt.time.hard = 200000 + #rt.time.soft = 2000000 + #rt.time.hard = 2000000 } flags = [ ifexists nofail ] } diff --git a/src/daemon/filter-chain/source-rnnoise.conf b/src/daemon/filter-chain/source-rnnoise.conf index 936294eb0..110ead171 100644 --- a/src/daemon/filter-chain/source-rnnoise.conf +++ b/src/daemon/filter-chain/source-rnnoise.conf @@ -16,8 +16,8 @@ context.modules = [ args = { #nice.level = -11 #rt.prio = 88 - #rt.time.soft = 200000 - #rt.time.hard = 200000 + #rt.time.soft = 2000000 + #rt.time.hard = 2000000 } flags = [ ifexists nofail ] } diff --git a/src/daemon/jack.conf.in b/src/daemon/jack.conf.in index b5f857682..1d283bca2 100644 --- a/src/daemon/jack.conf.in +++ b/src/daemon/jack.conf.in @@ -37,8 +37,8 @@ context.modules = [ args = { #nice.level = -11 #rt.prio = 88 - #rt.time.soft = 200000 - #rt.time.hard = 200000 + #rt.time.soft = 2000000 + #rt.time.hard = 2000000 } flags = [ ifexists nofail ] } diff --git a/src/daemon/media-session.d/media-session.conf b/src/daemon/media-session.d/media-session.conf index 07bae0849..c9a2471b0 100644 --- a/src/daemon/media-session.d/media-session.conf +++ b/src/daemon/media-session.d/media-session.conf @@ -36,8 +36,8 @@ context.modules = [ args = { #nice.level = -11 #rt.prio = 88 - #rt.time.soft = 200000 - #rt.time.hard = 200000 + #rt.time.soft = 2000000 + #rt.time.hard = 2000000 } flags = [ ifexists nofail ] } diff --git a/src/daemon/pipewire-pulse.conf.in b/src/daemon/pipewire-pulse.conf.in index 703d56b5a..871601556 100644 --- a/src/daemon/pipewire-pulse.conf.in +++ b/src/daemon/pipewire-pulse.conf.in @@ -21,8 +21,8 @@ context.modules = [ args = { #nice.level = -11 #rt.prio = 88 - #rt.time.soft = 200000 - #rt.time.hard = 200000 + #rt.time.soft = 2000000 + #rt.time.hard = 2000000 } flags = [ ifexists nofail ] } diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in index f326f1b30..ae31be488 100644 --- a/src/daemon/pipewire.conf.in +++ b/src/daemon/pipewire.conf.in @@ -70,8 +70,8 @@ context.modules = [ args = { #nice.level = -11 #rt.prio = 88 - #rt.time.soft = 200000 - #rt.time.hard = 200000 + #rt.time.soft = 2000000 + #rt.time.hard = 2000000 } flags = [ ifexists nofail ] } @@ -81,8 +81,8 @@ context.modules = [ # args = { # nice.level = -11 # rt.prio = 88 - # rt.time.soft = 200000 - # rt.time.hard = 200000 + # rt.time.soft = 2000000 + # rt.time.hard = 2000000 # } # flags = [ ifexists nofail ] #} diff --git a/src/modules/module-rt.c b/src/modules/module-rt.c index 9c36c5144..ffbc1a8a7 100644 --- a/src/modules/module-rt.c +++ b/src/modules/module-rt.c @@ -43,8 +43,8 @@ #define DEFAULT_NICE_LEVEL -11 #define DEFAULT_RT_PRIO 88 -#define DEFAULT_RT_TIME_SOFT 200000 -#define DEFAULT_RT_TIME_HARD 200000 +#define DEFAULT_RT_TIME_SOFT 2000000 +#define DEFAULT_RT_TIME_HARD 2000000 #define MODULE_USAGE \ "[nice.level=] " \ diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c index 1ebdb698f..dc0259b80 100644 --- a/src/modules/module-rtkit.c +++ b/src/modules/module-rtkit.c @@ -50,8 +50,8 @@ #define DEFAULT_NICE_LEVEL -11 #define DEFAULT_RT_PRIO 88 -#define DEFAULT_RT_TIME_SOFT 200000 -#define DEFAULT_RT_TIME_HARD 200000 +#define DEFAULT_RT_TIME_SOFT 2000000 +#define DEFAULT_RT_TIME_HARD 2000000 #define MODULE_USAGE "[nice.level=] " \ "[rt.prio=] " \