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

pma: partition striping wip

Browse Source
This commit is contained in:
barter-simsum 2024-01-17 17:40:46 -05:00
parent 439657f35f
commit 65965e1d13
1 changed files with 58 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,14 +252,14 @@ static_assert(BT_DAT_MAXBYTES % sizeof(BT_dat) == 0);
a meta page is like any other page, but the data section is used to store a meta page is like any other page, but the data section is used to store
additional information additional information
*/ */
#define BLK_BASE_LEN0 (MBYTES(2) - BT_META_SECTION_WIDTH) #define BLK_BASE_LEN0 ((size_t)MBYTES(2) - BT_META_SECTION_WIDTH)
#define BLK_BASE_LEN1 (MBYTES(8)) #define BLK_BASE_LEN1 ((size_t)MBYTES(8))
#define BLK_BASE_LEN2 (BLK_BASE_LEN1 * 4) #define BLK_BASE_LEN2 ((size_t)BLK_BASE_LEN1 * 4)
#define BLK_BASE_LEN3 (BLK_BASE_LEN2 * 4) #define BLK_BASE_LEN3 ((size_t)BLK_BASE_LEN2 * 4)
#define BLK_BASE_LEN4 (BLK_BASE_LEN3 * 4) #define BLK_BASE_LEN4 ((size_t)BLK_BASE_LEN3 * 4)
#define BLK_BASE_LEN5 (BLK_BASE_LEN4 * 4) #define BLK_BASE_LEN5 ((size_t)BLK_BASE_LEN4 * 4)
#define BLK_BASE_LEN6 (BLK_BASE_LEN5 * 4) #define BLK_BASE_LEN6 ((size_t)BLK_BASE_LEN5 * 4)
#define BLK_BASE_LEN7 (BLK_BASE_LEN6 * 4) #define BLK_BASE_LEN7 ((size_t)BLK_BASE_LEN6 * 4)
#define BLK_BASE_LEN_TOTAL ( \ #define BLK_BASE_LEN_TOTAL ( \
BT_META_SECTION_WIDTH + \ BT_META_SECTION_WIDTH + \
BLK_BASE_LEN0 + \ BLK_BASE_LEN0 + \
@ -270,6 +270,18 @@ static_assert(BT_DAT_MAXBYTES % sizeof(BT_dat) == 0);
BLK_BASE_LEN5 + \ BLK_BASE_LEN5 + \
BLK_BASE_LEN6 + \ BLK_BASE_LEN6 + \
BLK_BASE_LEN7) BLK_BASE_LEN7)
static const size_t BLK_BASE_LENS[8] = {
BLK_BASE_LEN0,
BLK_BASE_LEN1,
BLK_BASE_LEN2,
BLK_BASE_LEN3,
BLK_BASE_LEN4,
BLK_BASE_LEN5,
BLK_BASE_LEN6,
BLK_BASE_LEN7,
};
typedef struct BT_meta BT_meta; typedef struct BT_meta BT_meta;
struct BT_meta { struct BT_meta {
#define BT_NUMROOTS 32 #define BT_NUMROOTS 32
@ -436,13 +448,35 @@ _mlist_record_alloc(BT_state *state, void *lo, void *hi)
} }
} }
/* ;;: tmp. forward declared. move shit around */
static pgno_t
_bt_falloc(BT_state *state, size_t pages);
static void
_nlist_insertn(BT_state *state, BT_nlistnode **dst, pgno_t lo, pgno_t hi);
static void static void
_nlist_grow(BT_state *state) _nlist_grow(BT_state *state)
/* grows the nlist by allocating the next sized stripe from the block base /* grows the nlist by allocating the next sized stripe from the block base
array. Handles storing the offset of this stripe in state->blk_base */ array. Handles storing the offset of this stripe in state->blk_base */
{ {
/* ;;: i believe this will also need to appropriately modify the flist so BT_meta *meta = state->meta_pages[state->which];
that we don't store general allocation data in node partitions */
/* find the next block (non zero pgno) */
size_t next_block = 0;
for (; meta->blk_base[next_block] == 0; next_block++)
;
/* falloc the node partition and store its offset in the metapage */
size_t block_len_b = BLK_BASE_LENS[next_block];
size_t block_len_p = B2PAGES(block_len_b);
DPRINTF("Adding a new node stripe of size (pages): 0x%zX", block_len_p);
pgno_t partition_pg = _bt_falloc(state, block_len_p);
meta->blk_base[next_block] = partition_pg;
_nlist_insertn(state,
&state->nlist,
partition_pg,
partition_pg + block_len_p);
} }
static void static void
@ -546,8 +580,8 @@ _bt_nalloc(BT_state *state)
} }
if (ret == 0) { if (ret == 0) {
/* ;;: todo: insert a grow call */ DPUTS("nlist out of mem. allocating a new block.");
DPUTS("nlist out of mem!"); _nlist_grow(state);
return 0; return 0;
} }
@ -1050,6 +1084,15 @@ _nlist_insert(BT_state *state, BT_nlistnode **dst, pgno_t nodepg)
_nlist_insert2(state, dst, lo, hi); _nlist_insert2(state, dst, lo, hi);
} }
static void
_nlist_insertn(BT_state *state, BT_nlistnode **dst, pgno_t lo, pgno_t hi)
{
_nlist_insert2(state,
dst,
_node_get(state, lo),
_node_get(state, hi));
}
static void static void
_pending_nlist_merge(BT_state *state) _pending_nlist_merge(BT_state *state)
{ {
@ -1591,8 +1634,8 @@ _mlist_new(BT_state *state)
page (alloced or not) in the persistent file. */ page (alloced or not) in the persistent file. */
static void static void
_flist_grow(BT_state *state, size_t pages) _flist_grow(BT_state *state, size_t pages)
/* grows the backing file by PMA_GROW_SIZE_p and appends this freespace to the /* grows the backing file by maximally `pages' or minimally PMA_GROW_SIZE_p and
flist */ appends this freespace to the flist */
{ {
/* grow the backing file by at least PMA_GROW_SIZE_p */ /* grow the backing file by at least PMA_GROW_SIZE_p */
pages = MAX(pages, PMA_GROW_SIZE_p); pages = MAX(pages, PMA_GROW_SIZE_p);
@ -1626,10 +1669,6 @@ _flist_new(BT_state *state, size_t size_p)
} }
#undef FLIST_PG_START #undef FLIST_PG_START
/* ;;: tmp. forward declared. move shit around */
static pgno_t
_bt_falloc(BT_state *state, size_t pages);
static int static int
_nlist_new(BT_state *state) _nlist_new(BT_state *state)
{ {
@ -2227,7 +2266,7 @@ _bt_state_meta_new(BT_state *state)
} }
/* initialize the block base array */ /* initialize the block base array */
meta.blk_base[0] = BT_PAGESIZE * BT_NUMMETAS; meta.blk_base[0] = BT_NUMMETAS;
root = _bt_nalloc(state); root = _bt_nalloc(state);
_bt_root_new(&meta, root); _bt_root_new(&meta, root);
@ -2633,8 +2672,6 @@ _bt_sync(BT_state *state, BT_page *node, uint8_t depth, uint8_t maxdepth)
int int
bt_state_new(BT_state **state) bt_state_new(BT_state **state)
{ {
// TRACE();
BT_state *s = calloc(1, sizeof *s); BT_state *s = calloc(1, sizeof *s);
s->data_fd = -1; s->data_fd = -1;
s->fixaddr = BT_MAPADDR; s->fixaddr = BT_MAPADDR;