Skip to content

Commit 5e93fa4

Browse files
authored
Update to loom v0.3 (#381)
1 parent 9f40abc commit 5e93fa4

4 files changed

Lines changed: 58 additions & 25 deletions

File tree

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ serde_test = "1.0"
3333
# loom is currently not compiling on windows.
3434
# See: https://github.com/Xudong-Huang/generator-rs/issues/19
3535
[target.'cfg(not(windows))'.dev-dependencies]
36-
loom = "0.2.13"
36+
loom = "0.3"

‎src/bytes.rs‎

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ use alloc::{vec::Vec, string::String, boxed::Box, borrow::Borrow};
77
use crate::Buf;
88
use crate::buf::IntoIter;
99
use crate::loom::sync::atomic::{self, AtomicPtr, AtomicUsize, Ordering};
10+
#[allow(unused)]
11+
use crate::loom::sync::atomic::AtomicMut;
12+
1013

1114
/// A reference counted contiguous slice of memory.
1215
///
@@ -854,16 +857,18 @@ unsafe fn promotable_even_clone(data: &AtomicPtr<()>, ptr: *const u8, len: usize
854857
}
855858

856859
unsafe fn promotable_even_drop(data: &mut AtomicPtr<()>, ptr: *const u8, len: usize) {
857-
let shared = *data.get_mut();
858-
let kind = shared as usize & KIND_MASK;
860+
data.with_mut(|shared| {
861+
let shared = *shared;
862+
let kind = shared as usize & KIND_MASK;
859863

860-
if kind == KIND_ARC {
861-
release_shared(shared as *mut Shared);
862-
} else {
863-
debug_assert_eq!(kind, KIND_VEC);
864-
let buf = (shared as usize & !KIND_MASK) as *mut u8;
865-
drop(rebuild_boxed_slice(buf, ptr, len));
866-
}
864+
if kind == KIND_ARC {
865+
release_shared(shared as *mut Shared);
866+
} else {
867+
debug_assert_eq!(kind, KIND_VEC);
868+
let buf = (shared as usize & !KIND_MASK) as *mut u8;
869+
drop(rebuild_boxed_slice(buf, ptr, len));
870+
}
871+
});
867872
}
868873

869874
unsafe fn promotable_odd_clone(data: &AtomicPtr<()>, ptr: *const u8, len: usize) -> Bytes {
@@ -879,16 +884,18 @@ unsafe fn promotable_odd_clone(data: &AtomicPtr<()>, ptr: *const u8, len: usize)
879884
}
880885

881886
unsafe fn promotable_odd_drop(data: &mut AtomicPtr<()>, ptr: *const u8, len: usize) {
882-
let shared = *data.get_mut();
883-
let kind = shared as usize & KIND_MASK;
887+
data.with_mut(|shared| {
888+
let shared = *shared;
889+
let kind = shared as usize & KIND_MASK;
884890

885-
if kind == KIND_ARC {
886-
release_shared(shared as *mut Shared);
887-
} else {
888-
debug_assert_eq!(kind, KIND_VEC);
891+
if kind == KIND_ARC {
892+
release_shared(shared as *mut Shared);
893+
} else {
894+
debug_assert_eq!(kind, KIND_VEC);
889895

890-
drop(rebuild_boxed_slice(shared as *mut u8, ptr, len));
891-
}
896+
drop(rebuild_boxed_slice(shared as *mut u8, ptr, len));
897+
}
898+
});
892899
}
893900

894901
unsafe fn rebuild_boxed_slice(buf: *mut u8, offset: *const u8, len: usize) -> Box<[u8]> {
@@ -925,8 +932,9 @@ unsafe fn shared_clone(data: &AtomicPtr<()>, ptr: *const u8, len: usize) -> Byte
925932
}
926933

927934
unsafe fn shared_drop(data: &mut AtomicPtr<()>, _ptr: *const u8, _len: usize) {
928-
let shared = *data.get_mut();
929-
release_shared(shared as *mut Shared);
935+
data.with_mut(|shared| {
936+
release_shared(*shared as *mut Shared);
937+
});
930938
}
931939

932940
unsafe fn shallow_clone_arc(shared: *mut Shared, ptr: *const u8, len: usize) -> Bytes {
@@ -1062,7 +1070,7 @@ fn _split_off_must_use() {}
10621070
// fuzz tests
10631071
#[cfg(all(test, loom))]
10641072
mod fuzz {
1065-
use std::sync::Arc;
1073+
use loom::sync::Arc;
10661074
use loom::thread;
10671075

10681076
use super::Bytes;

‎src/bytes_mut.rs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ use crate::{Bytes, Buf, BufMut};
1010
use crate::bytes::Vtable;
1111
use crate::buf::IntoIter;
1212
use crate::loom::sync::atomic::{self, AtomicPtr, AtomicUsize, Ordering};
13+
#[allow(unused)]
14+
use crate::loom::sync::atomic::AtomicMut;
15+
1316

1417
/// A unique reference to a contiguous slice of memory.
1518
///
@@ -1482,8 +1485,9 @@ unsafe fn shared_v_clone(data: &AtomicPtr<()>, ptr: *const u8, len: usize) -> By
14821485
}
14831486

14841487
unsafe fn shared_v_drop(data: &mut AtomicPtr<()>, _ptr: *const u8, _len: usize) {
1485-
let shared = (*data.get_mut()) as *mut Shared;
1486-
release_shared(shared as *mut Shared);
1488+
data.with_mut(|shared| {
1489+
release_shared(*shared as *mut Shared);
1490+
});
14871491
}
14881492

14891493
// compile-fails
@@ -1521,7 +1525,7 @@ fn _split_must_use() {}
15211525
// fuzz tests
15221526
#[cfg(all(test, loom))]
15231527
mod fuzz {
1524-
use std::sync::Arc;
1528+
use loom::sync::Arc;
15251529
use loom::thread;
15261530

15271531
use crate::Bytes;

‎src/loom.rs‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,29 @@
22
pub(crate) mod sync {
33
pub(crate) mod atomic {
44
pub(crate) use core::sync::atomic::{fence, AtomicPtr, AtomicUsize, Ordering};
5+
6+
pub(crate) trait AtomicMut<T> {
7+
fn with_mut<F, R>(&mut self, f: F) -> R
8+
where
9+
F: FnOnce(&mut *mut T) -> R;
10+
}
11+
12+
impl<T> AtomicMut<T> for AtomicPtr<T> {
13+
fn with_mut<F, R>(&mut self, f: F) -> R
14+
where
15+
F: FnOnce(&mut *mut T) -> R,
16+
{
17+
f(self.get_mut())
18+
}
19+
}
520
}
621
}
722

823
#[cfg(all(test, loom))]
9-
pub(crate) use ::loom::sync;
24+
pub(crate) mod sync {
25+
pub(crate) mod atomic {
26+
pub(crate) use loom::sync::atomic::{fence, AtomicPtr, AtomicUsize, Ordering};
27+
28+
pub(crate) trait AtomicMut<T> {}
29+
}
30+
}

0 commit comments

Comments
 (0)