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: move BT_meta.chk to end of struct. hardcode 32 roots

Browse Source
This commit is contained in:
barter-simsum 2023-11-29 13:03:57 -05:00
parent 857c0051d9
commit 96b31ffe7f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,6 +233,7 @@ static_assert(BT_DAT_MAXBYTES % sizeof(BT_dat) == 0);
#define BLK_BASE_LEN7 (BLK_BASE_LEN6 * 4) #define BLK_BASE_LEN7 (BLK_BASE_LEN6 * 4)
typedef struct BT_meta BT_meta; typedef struct BT_meta BT_meta;
struct BT_meta { struct BT_meta {
#define BT_NUMROOTS 32
uint32_t magic; uint32_t magic;
uint32_t version; uint32_t version;
pgno_t last_pg; /* last page used in file */ pgno_t last_pg; /* last page used in file */
@ -252,13 +253,9 @@ struct BT_meta {
uint8_t flags; uint8_t flags;
uint8_t _pad1; uint8_t _pad1;
pgno_t root; pgno_t root;
/* ;;: confirm: shouldn't the checksum actually follow the roots array? */ /* 64bit alignment manually checked - 72 bytes total above */
uint64_t roots[BT_NUMROOTS]; /* for usage by ares */
uint32_t chk; /* checksum */ uint32_t chk; /* checksum */
/* 64bit alignment manually checked */
uint64_t roots[]; /* for usage by ares */
/* ;;: TODO: ensure the crc_32 checksum cannot be zero */
} __packed; } __packed;
static_assert(sizeof(BT_meta) <= BT_DAT_MAXBYTES); static_assert(sizeof(BT_meta) <= BT_DAT_MAXBYTES);