Skip to content

Updating binding code to match VM #201

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

Merged
merged 2 commits into from
Dec 10, 2024
Merged

Updating binding code to match VM #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a64072
Updating to 4aeea613eba905cdff343213e8f2b006574bd657 from mmtk/julia
udesou Dec 9, 2024
186cd70
Applying cargo fmt
udesou Dec 9, 2024
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
2 changes: 1 addition & 1 deletion mmtk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2018"
[package.metadata.julia]
# Our CI matches the following line and extract mmtk/julia. If this line is updated, please check ci yaml files and make sure it works.
julia_repo = "https://github.com/mmtk/julia.git"
julia_version = "bc08a9bc1b8574c6aa153656d5758153a5700912"
julia_version = "4c940c1b0d6e555b857172176c2805759261e81f"

[lib]
crate-type = ["cdylib"]
Expand Down
2 changes: 1 addition & 1 deletion mmtk/api/mmtk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ extern void mmtk_object_reference_write_post(MMTk_Mutator mutator, const void* s
extern void mmtk_object_reference_write_slow(MMTk_Mutator mutator, const void* src, const void* target);
extern const void* MMTK_SIDE_LOG_BIT_BASE_ADDRESS;

extern uintptr_t JULIA_MALLOC_BYTES;
extern _Atomic(uintptr_t) JULIA_MALLOC_BYTES;

/**
* Misc
Expand Down
2 changes: 1 addition & 1 deletion mmtk/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ extern "C" {
pub fn jl_throw_out_of_memory_error();
pub fn jl_get_gc_disable_counter() -> u32;
pub fn jl_gc_mmtk_sweep_malloced_memory();
pub fn jl_gc_mmtk_sweep_stack_pools();
pub fn jl_gc_sweep_stack_pools_and_mtarraylist_buffers();
pub fn jl_hrtime() -> u64;
pub fn jl_gc_update_stats(t: u64, mmtk_live_bytes: usize, is_nursery: bool);
pub fn jl_gc_get_abi_structs_checksum_c() -> usize;
Expand Down
4 changes: 2 additions & 2 deletions mmtk/src/scanning.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ use mmtk::Mutator;
use mmtk::MMTK;

use crate::jl_gc_mmtk_sweep_malloced_memory;
use crate::jl_gc_mmtk_sweep_stack_pools;
use crate::jl_gc_scan_vm_specific_roots;
use crate::jl_gc_sweep_stack_pools_and_mtarraylist_buffers;
use crate::JuliaVM;

pub struct VMScanning {}
Expand Down Expand Up @@ -218,7 +218,7 @@ impl<VM: VMBinding> GCWork<VM> for SweepVMSpecific {
fn do_work(&mut self, _worker: &mut GCWorker<VM>, _mmtk: &'static MMTK<VM>) {
// call sweep malloced arrays and sweep stack pools
unsafe { jl_gc_mmtk_sweep_malloced_memory() }
unsafe { jl_gc_mmtk_sweep_stack_pools() }
unsafe { jl_gc_sweep_stack_pools_and_mtarraylist_buffers() }
self.swept = true;
}
}
Expand Down