Skip to content

Simplify and slightly optimise how tasks are stored and selected #1447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daxtens wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Simplify and slightly optimise how tasks are stored and selected #1447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
36afb6c
`PartialEq` and `Eq` for `RelaxedAtomic`
daxtens Jul 17, 2025
3a02af0
Replace the linked list ordering for `Rav1dTask` with a sorted `Vec`
daxtens Jun 22, 2025
ce1f0a4
Do fewer `reset_task_cur` calls in `merge_pending`
daxtens Jul 6, 2025
bfb6e6c
Extract common logic to advance `first` into its own function
daxtens Jul 22, 2025
dc12f1a
Replace `reset_task_cur(_async)` with simpler, more documented functions
daxtens Jul 5, 2025
4d25cb0
Remove the now-unnecessary `'next` block
daxtens Jul 20, 2025
e1c16d0
Take the task vector read lock less
daxtens Jul 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions src/decode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4848,23 +4848,7 @@ pub fn rav1d_submit_frame(c: &Rav1dContext, state: &mut Rav1dState) -> Rav1dResu
}
let out_delayed = &mut state.frame_thread.out_delayed[next as usize];
if out_delayed.p.data.is_some() || fc.task_thread.error.load(Ordering::SeqCst) != 0 {
let first = c.task_thread.first.load(Ordering::SeqCst);
if first as usize + 1 < c.fc.len() {
c.task_thread.first.fetch_add(1, Ordering::SeqCst);
} else {
c.task_thread.first.store(0, Ordering::SeqCst);
}
let _ = c.task_thread.reset_task_cur.compare_exchange(
first,
u32::MAX,
Ordering::SeqCst,
Ordering::SeqCst,
);
// `cur` is not actually mutated from multiple threads concurrently
let cur = c.task_thread.cur.get();
if cur != 0 && (cur as usize) < c.fc.len() {
c.task_thread.cur.update(|cur| cur - 1);
}
c.task_thread.advance_first(c.fc.len());
}
let error = &mut *fc.task_thread.retval.try_lock().unwrap();
if error.is_some() {
Expand Down
Loading
Loading