Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 24 additions & 23 deletions apis/python/node/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1050,12 +1050,14 @@ unsafe fn seqlock_begin_write(gen_ptr: *mut u64) -> u64 {
/// `seqlock_end`'s `pre + 2` always produces an even generation,
/// avoiding a permanent parity inversion.
unsafe fn seqlock_begin_if_even(gen_ptr: *mut u64) -> u64 {
let cur = std::ptr::read_volatile(gen_ptr);
if cur % 2 == 0 {
std::ptr::write_volatile(gen_ptr, cur + 1);
std::sync::atomic::fence(std::sync::atomic::Ordering::Release);
unsafe {
let cur = std::ptr::read_volatile(gen_ptr);
if cur.is_multiple_of(2) {
std::ptr::write_volatile(gen_ptr, cur + 1);
std::sync::atomic::fence(std::sync::atomic::Ordering::Release);
}
cur & !1 // always return the even baseline
}
cur & !1 // always return the even baseline
}

/// Closes a memory-pool seqlock write (header offset 96).
Expand All @@ -1068,12 +1070,14 @@ unsafe fn seqlock_begin_if_even(gen_ptr: *mut u64) -> u64 {
/// contract but is dead code in production — see the leave-gen-odd blocks
/// in `write_memory_pool`.
unsafe fn seqlock_end(gen_ptr: *mut u64, pre_write_gen: u64, copy_ok: bool) {
if copy_ok {
std::ptr::write_volatile(gen_ptr, pre_write_gen.wrapping_add(2));
} else {
std::ptr::write_volatile(gen_ptr, pre_write_gen);
unsafe {
if copy_ok {
std::ptr::write_volatile(gen_ptr, pre_write_gen.wrapping_add(2));
} else {
std::ptr::write_volatile(gen_ptr, pre_write_gen);
}
std::sync::atomic::fence(std::sync::atomic::Ordering::Release);
}
std::sync::atomic::fence(std::sync::atomic::Ordering::Release);
}

#[cfg(test)]
Expand Down Expand Up @@ -2026,11 +2030,9 @@ impl Node {
// (CPU receivers). GPU receivers never touch the shmem data
// region, and the header-only shmem is too small (< 1 page) to
// benefit from pinning.
if !receiver_is_cuda {
if let Ok(helpers) = get_cuda_helpers(py) {
let bound = helpers.bind(py);
let _ = bound.call_method1("_register_host", (shmem_ptr as u64, total_size));
}
if !receiver_is_cuda && let Ok(helpers) = get_cuda_helpers(py) {
let bound = helpers.bind(py);
let _ = bound.call_method1("_register_host", (shmem_ptr as u64, total_size));
}

shmem.set_owner(false);
Expand Down Expand Up @@ -3046,19 +3048,18 @@ impl Node {
.node
.get_mut()
.read_pinned_memory(buffer_id.clone(), false)
{
if let Some(size) = metadata.parameters.get("size").and_then(|p| {
&& let Some(size) = metadata.parameters.get("size").and_then(|p| {
if let Parameter::Integer(v) = p {
Some(*v)
} else {
None
}
}) {
GPU_BUF_SIZES
.lock()
.unwrap_or_else(|e| e.into_inner())
.insert(buffer_id.clone(), size as u64);
}
})
{
GPU_BUF_SIZES
.lock()
.unwrap_or_else(|e| e.into_inner())
.insert(buffer_id.clone(), size as u64);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion apis/rust/node/src/node/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3305,7 +3305,7 @@ mod tests {
state.record("sink", "camera");

let start = Instant::now();
wait_for_grace(&[state.clone()], Duration::from_secs(30));
wait_for_grace(std::slice::from_ref(&state), Duration::from_secs(30));
wait_for_grace(&[], Duration::from_secs(30));

assert!(!state.is_frozen());
Expand Down