Skip to content

Make ComparisonPair::try_new return an Option #3

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make ComparisonPair::try_new return an Option #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 15 additions & 12 deletions kernel/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,14 @@ pub struct ComparisonPair {

impl ComparisonPair {
#[inline]
fn try_new(thread_id: ThreadId, partner: ThreadId) -> (bool, Self) {
let is_valid = partner.as_u32() > thread_id.as_u32();
let pair = Self {
fn try_new(thread_id: ThreadId, partner: ThreadId) -> Option<Self> {
if partner.as_u32() <= thread_id.as_u32() {
return None;
}
Some(Self {
lower: thread_id,
upper: partner,
};
(is_valid, pair)
})
}

#[inline]
Expand Down Expand Up @@ -127,13 +128,15 @@ pub fn bitonic_sort_step(
let partner = distance.find_partner(thread_id);

// Create comparison pair if valid
let (is_valid, pair) = ComparisonPair::try_new(thread_id, partner);
if is_valid && pair.is_in_bounds(num_elements) {
// Determine sort direction for this comparison
let direction = BitonicDirection::from_position(thread_id, stage, sort_order);

// Perform the comparison and swap
compare_and_swap(data, pair, direction);
let pair = ComparisonPair::try_new(thread_id, partner);
if let Some(pair) = pair {
if pair.is_in_bounds(num_elements) {
// Determine sort direction for this comparison
let direction = BitonicDirection::from_position(thread_id, stage, sort_order);

// Perform the comparison and swap
compare_and_swap(data, pair, direction);
}
}
}

Expand Down
Loading