aneuhaeuser/novaOS
1
0
Fork 0
mirror of https://github.com/iceHtwoO/novaOS.git synced 2026-04-17 04:32:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lint

Browse Source
This commit is contained in:
Alexander Neuhäuser
2025-12-20 17:23:40 +01:00
parent b5d3417572
commit 78c4cdc684
12 changed files with 135 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
heap/Cargo.toml
View File

@@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2024"
[dependencies]
NovaError = {path = "../NovaError"}
nova_error = {path = "../nova_error"}
[dev-dependencies]
rand = "0.9.2"

75
heap/src/lib.rs
View File

@@ -9,7 +9,7 @@ use core::{
result::Result,
};
use NovaError::NovaError;
use nova_error::NovaError;
extern crate alloc;
@@ -33,8 +33,8 @@ pub struct Heap {
impl Heap {
pub const fn empty() -> Self {
Self {
start_address: null_mut() as *mut HeapHeader,
end_address: null_mut() as *mut HeapHeader,
start_address: null_mut(),
end_address: null_mut(),
raw_size: 0,
}
}
@@ -60,11 +60,13 @@ impl Heap {
unsafe fn find_first_fit(&self, size: usize) -> Result<*mut HeapHeader, NovaError> {
let mut current = self.start_address;
while !fits(size, current) {
if let Some(next) = (*current).next {
current = next;
} else {
return Err(NovaError::HeapFull);
unsafe {
while !fits(size, current) {
if let Some(next) = (*current).next {
current = next;
} else {
return Err(NovaError::HeapFull);
}
}
}
Ok(current)
@@ -106,23 +108,22 @@ impl Heap {
let new_address = unsafe { current.byte_add(byte_offset) };
// Handle case where fragmenting center free space
let next = (*current).next;
if let Some(next) = next {
(*next).before = Some(new_address);
}
unsafe {
let next = (*current).next;
if let Some(next) = next {
(*next).before = Some(new_address);
}
ptr::write(
new_address as *mut HeapHeader,
new_address,
HeapHeader {
next,
before: Some(current),
size: (*current).size - byte_offset,
free: true,
},
)
};
unsafe {
);
(*current).next = Some(new_address);
(*current).free = false;
(*current).size = size;
@@ -135,21 +136,21 @@ impl Heap {
// IF prev is free:
// Delete header, add size to previous and fix pointers.
// Move Head left
if let Some(before_head) = (*segment).before {
if (*before_head).free {
(*before_head).size += (*segment).size + HEAP_HEADER_SIZE;
delete_header(segment);
segment = before_head;
}
if let Some(before_head) = (*segment).before
&& (*before_head).free
{
(*before_head).size += (*segment).size + HEAP_HEADER_SIZE;
delete_header(segment);
segment = before_head;
}
// IF next is free:
// Delete next header and merge size, fix pointers
if let Some(next_head) = (*segment).next {
if (*next_head).free {
(*segment).size += (*next_head).size + HEAP_HEADER_SIZE;
delete_header(next_head);
}
if let Some(next_head) = (*segment).next
&& (*next_head).free
{
(*segment).size += (*next_head).size + HEAP_HEADER_SIZE;
delete_header(next_head);
}
// Neither: Set free
@@ -177,19 +178,21 @@ unsafe impl GlobalAlloc for Heap {
unsafe impl Sync for Heap {}
unsafe fn fits(size: usize, header: *mut HeapHeader) -> bool {
(*header).free && size <= (*header).size
unsafe { (*header).free && size <= (*header).size }
}
unsafe fn delete_header(header: *mut HeapHeader) {
let before_opt = (*header).before;
let next_opt = (*header).next;
unsafe {
let before_opt = (*header).before;
let next_opt = (*header).next;
if let Some(before) = before_opt {
(*before).next = next_opt;
}
if let Some(before) = before_opt {
(*before).next = next_opt;
}
if let Some(next) = next_opt {
(*next).before = before_opt;
if let Some(next) = next_opt {
(*next).before = before_opt;
}
}
}