GitHub/bdwgc-rust
1
0
Fork 1
mirror of https://github.com/bdwgc/bdwgc-rust.git synced 2026-05-30 02:18:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace disable/enable functions with lock/unlock

Browse Source
This commit is contained in:
Yota Toyama
2019-06-01 21:29:19 +00:00
parent b1a73dc728
commit 6cd1327c5c
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/coroutines/src/main.rs
View File

@@ -10,12 +10,12 @@ static GLOBAL_ALLOCATOR: Allocator = Allocator;
fn main() { fn main() {
unsafe { Allocator::initialize() } unsafe { Allocator::initialize() }
Allocator::disable_gc(); Allocator::lock();
let handle = Coroutine::spawn(move |_, _| { let handle = Coroutine::spawn(move |_, _| {
let bottom: u8 = 0; let bottom: u8 = 0;
unsafe { Allocator::set_stack_bottom(&bottom) } unsafe { Allocator::set_stack_bottom(&bottom) }
Allocator::enable_gc(); Allocator::unlock();
loop { loop {
unsafe { std::alloc::alloc(Layout::from_size_align(2 ^ 8, 8).unwrap()) }; unsafe { std::alloc::alloc(Layout::from_size_align(2 ^ 8, 8).unwrap()) };

8
examples/suspended_coroutines/src/main.rs
View File

@@ -11,22 +11,22 @@ static GLOBAL_ALLOCATOR: Allocator = Allocator;
fn main() { fn main() {
unsafe { Allocator::initialize() } unsafe { Allocator::initialize() }
Allocator::disable_gc(); Allocator::lock();
let mut handle = Coroutine::spawn(move |me, _| { let mut handle = Coroutine::spawn(move |me, _| {
let bottom: u8 = 0; let bottom: u8 = 0;
unsafe { Allocator::set_stack_bottom(&bottom) } unsafe { Allocator::set_stack_bottom(&bottom) }
Allocator::enable_gc(); Allocator::unlock();
me.yield_with(42); me.yield_with(42);
unsafe { Allocator::set_stack_bottom(&bottom) } unsafe { Allocator::set_stack_bottom(&bottom) }
Allocator::enable_gc(); Allocator::unlock();
loop { loop {
unsafe { std::alloc::alloc(Layout::from_size_align(2 ^ 8, 8).unwrap()) }; unsafe { std::alloc::alloc(Layout::from_size_align(2 ^ 8, 8).unwrap()) };
} }
}); });
Allocator::disable_gc(); Allocator::lock();
assert_eq!(handle.resume(0).unwrap(), 42); assert_eq!(handle.resume(0).unwrap(), 42);
handle.resume(0).unwrap(); handle.resume(0).unwrap();

12
src/lib.rs
View File

@@ -20,8 +20,8 @@ extern "C" {
callback: unsafe extern "C" fn(*const c_void) -> *const c_void, callback: unsafe extern "C" fn(*const c_void) -> *const c_void,
client_data: *const c_void, client_data: *const c_void,
) -> *const c_void; ) -> *const c_void;
fn GC_disable() -> c_void; fn GC_alloc_lock() -> c_void;
fn GC_enable() -> c_void; fn GC_alloc_unlock() -> c_void;
fn GC_free(ptr: *mut c_void); fn GC_free(ptr: *mut c_void);
fn GC_get_stack_base(stack_base: *mut GcStackBase) -> c_int; fn GC_get_stack_base(stack_base: *mut GcStackBase) -> c_int;
fn GC_init() -> c_void; fn GC_init() -> c_void;
@@ -34,12 +34,12 @@ extern "C" {
pub struct Allocator; pub struct Allocator;
impl Allocator { impl Allocator {
pub fn disable_gc() { pub fn lock() {
unsafe { GC_disable() }; unsafe { GC_alloc_lock() };
} }
pub fn enable_gc() { pub fn unlock() {
unsafe { GC_enable() }; unsafe { GC_alloc_unlock() };
} }
pub unsafe fn initialize() { pub unsafe fn initialize() {