Skip to content
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

Update to MMTk core PR #949 #240

Merged
merged 7 commits into from
Oct 24, 2023
Merged

Update to MMTk core PR #949 #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
444146a
Update to mmtk-core PR #949
qinsoon Sep 13, 2023
a2a938d
Update mmtk-core
qinsoon Sep 13, 2023
4af6b53
Merge branch 'master' into update-mmtk-core-pr-949
qinsoon Oct 16, 2023
e12fed1
Update
qinsoon Oct 19, 2023
8238339
Rename plan to context
qinsoon Oct 19, 2023
0f641a7
Merge branch 'master' into update-mmtk-core-pr-949
qinsoon Oct 23, 2023
abb83d9
Update mmtk-core to 57af17fbfd94ff0df2cd3b1e504abe299ce4f0ab
mmtkgc-bot Oct 24, 2023
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
24 changes: 12 additions & 12 deletions mmtk/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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 @@ -32,7 +32,7 @@ memoffset = "0.9.0"
# - change branch
# - change repo name
# But other changes including adding/removing whitespaces in commented lines may break the CI.
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "06a2e5d9773c9f7a32a6afc1add9cef311432dbc" }
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "57af17fbfd94ff0df2cd3b1e504abe299ce4f0ab" }
# Uncomment the following to build locally
# mmtk = { path = "../repos/mmtk-core" }

Expand Down
5 changes: 0 additions & 5 deletions mmtk/src/active_plan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use crate::UPCALLS;
use mmtk::util::opaque_pointer::*;
use mmtk::vm::ActivePlan;
use mmtk::Mutator;
use mmtk::Plan;
use std::collections::VecDeque;
use std::marker::PhantomData;

Expand Down Expand Up @@ -39,10 +38,6 @@ impl<'a, const COMPRESSED: bool> Iterator for OpenJDKMutatorIterator<'a, COMPRES
pub struct VMActivePlan {}

impl<const COMPRESSED: bool> ActivePlan<OpenJDK<COMPRESSED>> for VMActivePlan {
fn global() -> &'static dyn Plan<VM = OpenJDK<COMPRESSED>> {
crate::singleton::<COMPRESSED>().get_plan()
}

fn is_mutator(tls: VMThread) -> bool {
unsafe { ((*UPCALLS).is_mutator)(tls) }
}
Expand Down
5 changes: 0 additions & 5 deletions mmtk/src/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,11 +299,6 @@ pub extern "C" fn is_mapped_address(addr: Address) -> bool {
memory_manager::is_mapped_address(addr)
}

#[no_mangle]
pub extern "C" fn modify_check(object: ObjectReference) {
with_singleton!(|singleton| memory_manager::modify_check(singleton, object))
}

#[no_mangle]
pub extern "C" fn add_weak_candidate(reff: ObjectReference) {
with_singleton!(|singleton| memory_manager::add_weak_candidate(singleton, reff))
Expand Down
1 change: 0 additions & 1 deletion openjdk/mmtk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ extern void release_buffer(void** buffer, size_t len, size_t cap);

extern bool is_in_mmtk_spaces(void* ref);
extern bool is_mapped_address(void* addr);
extern void modify_check(void* ref);

// This type declaration needs to match AllocatorSelector in mmtk-core
struct AllocatorSelector {
Expand Down
10 changes: 5 additions & 5 deletions openjdk/mmtkMutator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,21 @@ struct BumpAllocator {
void* cursor;
void* limit;
RustDynPtr space;
RustDynPtr plan;
void* context;
};

struct LargeObjectAllocator {
void* tls;
void* space;
RustDynPtr plan;
void* context;
};

struct ImmixAllocator {
void* tls;
void* cursor;
void* limit;
void* immix_space;
RustDynPtr plan;
void* context;
uint8_t hot;
uint8_t copy;
void* large_cursor;
Expand All @@ -72,7 +72,7 @@ struct FLBlockList {
struct FreeListAllocator {
void* tls;
void* space;
RustDynPtr plan;
void* context;
FLBlockList* available_blocks;
FLBlockList* available_blocks_stress;
FLBlockList* unswept_blocks;
Expand All @@ -82,7 +82,7 @@ struct FreeListAllocator {
struct MallocAllocator {
void* tls;
void* space;
RustDynPtr plan;
void* context;
};

struct MarkCompactAllocator {
Expand Down
Loading