entailz/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

all: remove thread_local feature

Browse source
This commit is contained in:
Julian Orth 2024-02-22 22:45:46 +01:00
parent 0c3c03b130
commit 53aa762239
9 changed files with 82 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/clientmem.rs
View file

@ -88,12 +88,12 @@ impl ClientMemOffset {
}
let mref = MemRef {
mem: &*self.mem,
outer: MEM,
outer: MEM.get(),
};
MEM = &mref;
MEM.set(&mref);
compiler_fence(Ordering::SeqCst);
let res = f(&*self.data);
MEM = mref.outer;
MEM.set(mref.outer);
compiler_fence(Ordering::SeqCst);
match self.mem.failed.get() {
true => Err(ClientMemError::Sigbus),
@ -116,8 +116,9 @@ struct MemRef {
outer: *const MemRef,
}
#[thread_local]
static mut MEM: *const MemRef = ptr::null();
thread_local! {
static MEM: Cell<*const MemRef> = const { Cell::new(ptr::null()) };
}
unsafe fn kill() -> ! {
c::signal(c::SIGBUS, c::SIG_DFL);
@ -127,7 +128,7 @@ unsafe fn kill() -> ! {
unsafe extern "C" fn sigbus(sig: i32, info: &c::siginfo_t, _ucontext: *mut c::c_void) {
assert_eq!(sig, c::SIGBUS);
let mut memr_ptr = MEM;
let mut memr_ptr = MEM.get();
while !memr_ptr.is_null() {
let memr = &*memr_ptr;
let mem = &*memr.mem;