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

Different version of heap for regular allocations #285

Merged
merged 7 commits into from May 7, 2020
Merged

Different version of heap for regular allocations #285

merged 7 commits into from May 7, 2020

Conversation

Ramla-I
Copy link
Member

@Ramla-I Ramla-I commented May 6, 2020

  • moved slabmalloc to the kernel, and added the safe and unsafe versions as separate crates
  • edited multiple_heaps to use different slabmalloc versions depending on compile time flags
  • MappedPages merge() now a method that takes self as a parameter.

@Ramla-I Ramla-I requested a review from kevinaboos May 6, 2020 07:11
kevinaboos
kevinaboos approved these changes May 7, 2020
View reviewed changes
Copy link
Member

@kevinaboos kevinaboos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tough to review, so many changes. I will trust you to get it right.

@Ramla-I Ramla-I merged commit 2a7041e into theseus-os:theseus_main May 7, 2020
@Ramla-I Ramla-I deleted the safe_heap branch May 7, 2020 23:09
kevinaboos pushed a commit that referenced this pull request Sep 1, 2020
@Ramla-I @kevinaboos
Heap can use different versions of slabmalloc (#285)
fd985ae 
* Moved slabmalloc crate to the kernel, and added the safe and unsafe versions of slabmalloc as separate crates. Configuration options are used to select the crate used by the heap.

* Edited multiple_heaps crate to use different slabmalloc versions depending on compile time flags.

* MappedPages merge() now a method that takes mut self as a parameter.
kevinaboos pushed a commit that referenced this pull request Sep 1, 2020
@Ramla-I @kevinaboos
Heap can use different versions of slabmalloc (#285)
9133d03 
* Moved slabmalloc crate to the kernel, and added the safe and unsafe versions of slabmalloc as separate crates. Configuration options are used to select the crate used by the heap.

* Edited multiple_heaps crate to use different slabmalloc versions depending on compile time flags.

* MappedPages merge() now a method that takes mut self as a parameter.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kevinaboos kevinaboos kevinaboos approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Ramla-I @kevinaboos