mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-02-23 01:40:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

thread: add thread.reset-on-fork

Browse source 
Add a new thread.reset-on-fork property for the thread creator. when set
to false, it will clear the default SCHED_RESET_ON_FORK flag and new RT
threads will be able to fork and inherit the rt policy and priority.

When creating a thread make sure we set SCHED_RESET_ON_FORK when the
thread.reset-on-fork property is not explicitly false;

module-rt needs to preserve the SCHED_RESET_ON_FORK flag when changing
the policy.

Set thread.reset-on-fork=false explicitly for JACK clients to restore
the JACK behaviour where implementations can fork and inherit the RT
policy and priority by default.

Fixes #4966
This commit is contained in:
Wim Taymans 2025-11-06 11:35:10 +01:00
parent 1f3bc6eff5
commit 1191c18641
6 changed files with 48 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/modules/module-rt.c
View file

@ -650,8 +650,8 @@ static int set_rlimit(struct rlimit *rlim)
static int acquire_rt_sched(struct spa_thread *thread, int priority)
{
int err, min, max;
struct sched_param sp;
int err, min, max, new_policy, old_policy;
struct sched_param new_sched_params, old_sched_params;
pthread_t pt = (pthread_t)thread;
min = max = 0;
@ -663,10 +663,18 @@ static int acquire_rt_sched(struct spa_thread *thread, int priority)
priority, min, max, REALTIME_POLICY);
priority = SPA_CLAMP(priority, min, max);
}
if ((err = pthread_getschedparam(pt, &old_policy, &old_sched_params)) != 0) {
pw_log_warn("Failed to get scheduling params: %s", strerror(err));
old_policy = SCHED_RESET_ON_FORK;
}
spa_zero(sp);
sp.sched_priority = priority;
if ((err = pthread_setschedparam(pt, REALTIME_POLICY | SCHED_RESET_ON_FORK, &sp)) != 0) {
spa_zero(new_sched_params);
new_sched_params.sched_priority = priority;
new_policy = REALTIME_POLICY;
if ((old_policy & SCHED_RESET_ON_FORK) != 0)
new_policy |= SCHED_RESET_ON_FORK;
if ((err = pthread_setschedparam(pt, new_policy, &new_sched_params)) != 0) {
pw_log_warn("could not make thread %p realtime: %s", thread, strerror(err));
return -err;
}
@ -677,12 +685,21 @@ static int acquire_rt_sched(struct spa_thread *thread, int priority)
static int impl_drop_rt_generic(void *object, struct spa_thread *thread)
{
struct sched_param sp;
struct sched_param new_sched_params, old_sched_params;
pthread_t pt = (pthread_t)thread;
int err;
int err, new_policy, old_policy;
spa_zero(sp);
if ((err = pthread_setschedparam(pt, SCHED_OTHER | SCHED_RESET_ON_FORK, &sp)) != 0) {
if ((err = pthread_getschedparam(pt, &old_policy, &old_sched_params)) != 0) {
pw_log_warn("Failed to get scheduling params: %s", strerror(err));
old_policy = SCHED_RESET_ON_FORK;
}
spa_zero(new_sched_params);
new_policy = SCHED_OTHER;
if (SPA_FLAG_IS_SET(old_policy, SCHED_RESET_ON_FORK))
new_policy |= SCHED_RESET_ON_FORK;
if ((err = pthread_setschedparam(pt, new_policy, &new_sched_params)) != 0) {
pw_log_debug("thread %p: SCHED_OTHER|SCHED_RESET_ON_FORK failed: %s",
thread, strerror(err));
return -err;