Refactor Space::acquire #1401
Merged
Refactor Space::acquire #1401
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We extract portions of that function into separate functions or lambda
expressions in order to make the main decision tree logic terse.
We do not intend to change the logic of this function, but we fix some
obvious bugs in this commit.
- It is a runtime error if we need GC but GC is not initialized. We
use `panic!` instead of `assert!`.
- Now the value passed to `on_pending_allocation` always includes
metadata size.
The closure doesn't return zero.
qinsoon
reviewed
Oct 13, 2025
src/policy/space.rs
Outdated
| if let Some(addr) = self.get_new_pages_and_initialize(pr, pages_reserved, pages, tls) { | ||
| addr | ||
| } else { | ||
| on_gc_required(true); |
There was a problem hiding this comment.
This is a bit confusing: GC is not required at this point, and on_gc_required will actually require GC.
Maybe you could just do something like below:
if let Some(addr) = self.get_new_pages_and_initialize(pr, pages_reserved, pages, tls) {
addr
} else {
if alloc_options.on_fail.allow_gc() {
// We thought we had memory to allocate, but somehow failed the allocation. Will force a GC.
let gc_performed = self.get_gc_trigger().poll(true, Some(self.as_space()));
debug_assert!(gc_performed, "GC not performed when forced.");
on_gc_required();
}
Address::ZERO
}
src/policy/space.rs
Outdated
|
|
||
| if should_poll && self.get_gc_trigger().poll(false, Some(self.as_space())) { | ||
| // Handle the case that GC is required. | ||
| let on_gc_required = |attempted_allocation_and_failed: bool| { |
There was a problem hiding this comment.
This can be extracted as a new method, like what you did with get_new_pages_and_initialize.
Make it consistent with the order variables are introduced.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We extract portions of that function into separate functions or lambda expressions in order to make the main decision tree logic terse.
We do not intend to change the logic of this function, but we fix some obvious bugs in this commit.
panic!instead ofassert!.on_pending_allocationalways includes metadata size.