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

pma: misc bug fixes in _bt_state_load

Browse Source
This commit is contained in:
barter-simsum 2023-12-06 18:23:33 -05:00
parent f07bc63e01
commit e4695f641c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -388,7 +388,7 @@ _bt_nalloc(BT_state *state)
implemented. Rather than assert, conditionally check if we're at the implemented. Rather than assert, conditionally check if we're at the
end of the current stripe. If so, allocate a new region and append that end of the current stripe. If so, allocate a new region and append that
to the freelist. */ to the freelist. */
size_t width = (BYTE *)state->nlist - state->map; size_t width = (BYTE *)state->nlist->va - state->map;
/* ;;: asserting 2M for now since partition striping is unimplemented */ /* ;;: asserting 2M for now since partition striping is unimplemented */
assert(width < MBYTES(2)); assert(width < MBYTES(2));
/* perfect fit */ /* perfect fit */
@ -2216,13 +2216,14 @@ _bt_state_load(BT_state *state)
state->file_size = PMA_GROW_SIZE; state->file_size = PMA_GROW_SIZE;
assert(SUCC(_nlist_new(state))); assert(SUCC(_nlist_new(state)));
assert(SUCC(_mlist_new(state)));
assert(SUCC(_flist_new(state)));
if (!SUCC(rc = _bt_state_meta_new(state))) { if (!SUCC(rc = _bt_state_meta_new(state))) {
munmap(state->map, BT_ADDRSIZE); munmap(state->map, BT_ADDRSIZE);
return rc; return rc;
} }
assert(SUCC(_mlist_new(state)));
assert(SUCC(_flist_new(state)));
} }
else { else {
/* restore ephemeral freelists */ /* restore ephemeral freelists */