tehsquidge/SquidgeOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove redundant comments

Browse source
This commit is contained in:
Liam Kerr 2026-02-09 20:59:56 +00:00
parent 175c6ce0f0
commit 977f63b14f
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/kernel/memory.c
View file

@ -81,7 +81,6 @@ void *kmalloc(size_t size)
if (current == NULL) if (current == NULL)
{ {
// No suitable block found, allocate a new page
HeapHeader *header = (HeapHeader *)page_alloc(); HeapHeader *header = (HeapHeader *)page_alloc();
header->size = PAGE_SIZE - sizeof(HeapHeader); header->size = PAGE_SIZE - sizeof(HeapHeader);
header->is_free = 1; header->is_free = 1;
@ -95,7 +94,6 @@ void *kmalloc(size_t size)
current = header; current = header;
} }
// Now, current is a block that can be used
if (!current) if (!current)
{ {
return NULL; return NULL;
@ -103,12 +101,10 @@ void *kmalloc(size_t size)
current->is_free = 0; current->is_free = 0;
// If the block is larger than needed, split it
size_t min_split_size = sizeof(HeapHeader) + 16; size_t min_split_size = sizeof(HeapHeader) + 16;
if (current->size >= size + min_split_size) if (current->size >= size + min_split_size)
{ {
HeapHeader *new_header = (HeapHeader *)((uint8_t *)current + sizeof(HeapHeader) + size); HeapHeader *new_header = (HeapHeader *)((uint8_t *)current + sizeof(HeapHeader) + size);
// Safety check: if new_header address is wild, abort!
if ((uintptr_t)new_header < 0x80000000 || (uintptr_t)new_header > 0x88000000) if ((uintptr_t)new_header < 0x80000000 || (uintptr_t)new_header > 0x88000000)
{ {
kpanic("Splitting created invalid pointer!"); kpanic("Splitting created invalid pointer!");
@ -148,7 +144,7 @@ void kcoalesce(HeapHeader *header)
{ {
if (!header || !header->is_free) if (!header || !header->is_free)
return; return;
// merge backward // jump backward
while (header->prev && header->prev->is_free) while (header->prev && header->prev->is_free)
{ {
header = header->prev; header = header->prev;
@ -214,18 +210,16 @@ void test_memory_stress()
{ {
kprintf("Starting Stress Test...\n"); kprintf("Starting Stress Test...\n");
heap_stats(); heap_stats();
void *ptrs[100] = {0}; // Track allocated pointers void *ptrs[100] = {0};
uint32_t seed = 0xACE2026; // Example seed uint32_t seed = 0xACE2026;
for (int i = 0; i < 1000; i++) for (int i = 0; i < 1000; i++)
{ {
// 1. Randomly allocate or free
int idx = (seed >> 16) % 50; int idx = (seed >> 16) % 50;
if (ptrs[idx] == NULL) if (ptrs[idx] == NULL)
{ {
size_t size = (seed % 256) + 1; size_t size = (seed % 256) + 1;
ptrs[idx] = kmalloc(size); ptrs[idx] = kmalloc(size);
// Optional: fill with data to check integrity later
} }
else else
{ {