urbit/ares
1
1
Fork 0
mirror of https://github.com/urbit/ares.git synced 2024-11-23 09:06:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

pma: amend bt_next_alloc impl

Browse Source
This commit is contained in:
barter-simsum 2023-12-01 16:37:18 -05:00
parent 2aae3d046b
commit dc760add87
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rust/ares_pma/c-src/btree.c
View File

@ -2485,6 +2485,10 @@ bt_next_alloc(BT_state *state, void *p, void **lo, void **hi)
{ {
BT_mlistnode *head = state->mlist; BT_mlistnode *head = state->mlist;
while (head) { while (head) {
/* at last free block, different logic applies */
if (head->next == 0)
goto end;
/* p is in a free range, return the allocated hole after it */ /* p is in a free range, return the allocated hole after it */
if (head->va <= p if (head->va <= p
&& head->va + head->sz > p) { && head->va + head->sz > p) {
@ -2509,6 +2513,19 @@ bt_next_alloc(BT_state *state, void *p, void **lo, void **hi)
/* ... and ends at the start of the next free block */ /* ... and ends at the start of the next free block */
*hi = head->next->va; *hi = head->next->va;
return BT_SUCC; return BT_SUCC;
end:
void *pma_end = (void *)((uintptr_t)BT_MAPADDR + BT_ADDRSIZE);
assert(head->va + head->sz <= pma_end);
/* no alloced region between tail of freelist and end of pma memory space */
if (head->va + head->sz == pma_end)
return 1;
/* otherwise, return the alloced region between the tail of the freelist and
the end of the memory arena */
*lo = head->va + head->sz;
*hi = pma_end;
return BT_SUCC;
} }
void void