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

Jump to bottom

Enqueue to BlockQueue backwards #1235

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Enqueue to BlockQueue backwards #1235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions src/util/heap/blockpageresource.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,13 @@ impl<VM: VMBinding, B: Region> PageResource<VM> for BlockPageResource<VM, B> {
required_pages: usize,
tls: VMThread,
) -> Result<PRAllocResult, PRAllocFail> {
self.alloc_pages_fast(space_descriptor, reserved_pages, required_pages, tls)
let result = self.alloc_pages_fast(space_descriptor, reserved_pages, required_pages, tls);
if let Ok(ref r) = result {
info!("alloc_pages: {}", r.start);
} else {
info!("alloc_pages: failed");
}
result
}

fn get_available_physical_pages(&self) -> usize {
Expand Down Expand Up @@ -118,18 +124,16 @@ impl<VM: VMBinding, B: Region> BlockPageResource<VM, B> {
// 2. Take the first block int the chunk as the allocation result
let first_block = start;
// 3. Push all remaining blocks to one or more block lists
let last_block = start + BYTES_IN_CHUNK;
let mut array = BlockQueue::new();
let mut cursor = start + B::BYTES;
while cursor < last_block {
for offset in (B::BYTES..BYTES_IN_CHUNK).step_by(B::BYTES).rev() {
let cursor = start + offset;
let result = unsafe { array.push_relaxed(B::from_aligned_address(cursor)) };
if let Err(block) = result {
self.block_queue.add_global_array(array);
array = BlockQueue::new();
let result2 = unsafe { array.push_relaxed(block) };
debug_assert!(result2.is_ok());
}
cursor += B::BYTES;
}
debug_assert!(!array.is_empty());
// 4. Push the block list to the global pool
Expand Down
Loading