mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2025-04-28 07:55:22 +00:00
Code Issues Projects Releases Wiki Activity

ts/Task: wake up after the triggering event is pushed

Browse source 
The scheduler is awaken when aborting a task loop, but not after
a triggering event is pushed. This can cause throttling to induce
long state transitions for pipelines with many streams.

Observed for Unprepare with:

GST_DEBUG=ts-benchmark:4 ../../target/debug/examples/benchmark 2000 ts-udpsrc 2 20 5000
This commit is contained in:
François Laignel 2022-07-30 12:18:30 +02:00 committed by Sebastian Dröge
parent 374671cb6f
commit 833331ab66
1 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
generic/threadshare/src/runtime/task.rs
View file

@ -353,25 +353,14 @@ impl TaskInner {
} }
})?; })?;
self.context.as_ref().unwrap().wake_up();
Ok(ack_rx) Ok(ack_rx)
} }
/// Aborts the task iteration loop ASAP.
///
/// When the iteration loop is throttling, the call to `abort`
/// on the `loop_abort_handle` returns immediately, but the
/// actual `Future` for the iteration loop is aborted only when
/// the scheduler throttling completes.
///
/// This function aborts the task iteration loop and awakes the
/// iteration scheduler.
fn abort_task_loop(&mut self) { fn abort_task_loop(&mut self) {
if let Some(loop_abort_handle) = self.loop_abort_handle.take() { if let Some(loop_abort_handle) = self.loop_abort_handle.take() {
loop_abort_handle.abort(); loop_abort_handle.abort();
if let Some(context) = self.context.as_ref() {
context.wake_up();
}
} }
} }
} }
@ -508,6 +497,10 @@ impl Task {
inner.state = TaskState::Unpreparing; inner.state = TaskState::Unpreparing;
if let Some(prepare_abort_handle) = inner.prepare_abort_handle.take() {
prepare_abort_handle.abort();
}
inner.abort_task_loop(); inner.abort_task_loop();
let _ = inner.trigger(Trigger::Unprepare).unwrap(); let _ = inner.trigger(Trigger::Unprepare).unwrap();
@ -515,11 +508,6 @@ impl Task {
let state_machine_handle = inner.state_machine_handle.take(); let state_machine_handle = inner.state_machine_handle.take();
let context = inner.context.take().unwrap(); let context = inner.context.take().unwrap();
if let Some(prepare_abort_handle) = inner.prepare_abort_handle.take() {
prepare_abort_handle.abort();
}
drop(inner); drop(inner);
match state_machine_handle { match state_machine_handle {