metaverse
/
kernel-dev-old
Archived
1
2
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复raw_allocator在某些时候死循环的问题

This commit is contained in:
pointer-to-bios 2024-01-31 21:11:19 +08:00
parent 6d24ee84f4
commit 85df2a7609
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/kernel/memm/allocator/raw.c
View File

@ -17,17 +17,19 @@ void *raw_allocator_allocate(raw_allocator_t *allocator, usize size, usize align
{ {
usize real_size = size; usize real_size = size;
align_to(real_size, 16); align_to(real_size, 16);
raw_allocator_cell *cell = allocator->cells; raw_allocator_cell *cell = &allocator->cells;
while ((void *)raw_allocator_next_cell(cell) < (void *)allocator + allocator->size) while ((void *)cell < raw_allocator_end(allocator))
{ {
while ( // 确保cell指向的内容还在这个allocator内 while ( // 确保cell指向的内容还在这个allocator内
(void *)raw_allocator_next_cell(cell) < raw_allocator_end(allocator) && (void *)cell < raw_allocator_end(allocator) &&
cell->length != 0) cell->length != 0)
{ {
cell = raw_allocator_next_cell(cell); cell = raw_allocator_next_cell(cell);
} }
if (real_size <= cell->capacity) if (real_size <= cell->capacity)
break; break;
else
cell = raw_allocator_next_cell(cell);
} }
if ((void *)cell < raw_allocator_end(allocator)) if ((void *)cell < raw_allocator_end(allocator))
goto fitable_cell_finded; goto fitable_cell_finded;