Skip to content

u3: restores allocator highwater-mark bookkeeping #1064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joemfb wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

u3: restores allocator highwater-mark bookkeeping #1064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a7614f
Release vere-v4.6 (#1052)
pkova Jul 3, 2026
120fa52
u3: restores CPU_DEBUG bookkeeping for highwater-mark printfs
joemfb Jul 20, 2026
c11a7bc
Merge branch 'develop' into jb/high-water
joemfb Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions pkg/noun/allocate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,28 +179,6 @@ u3a_pack_done(void)
c3_free(u3a_Gack.buf_w);
}

/* _box_count(): adjust memory count.
*/
#ifdef U3_CPU_DEBUG
static void
_box_count(c3_ws siz_ws)
{
u3R->all.fre_w += siz_ws;

{
c3_w end_w = u3a_heap(u3R);
c3_w all_w = (end_w - u3R->all.fre_w);

if ( all_w > u3R->all.max_w ) {
u3R->all.max_w = all_w;
}
}
}
#else
static void
_box_count(c3_ws siz_ws) { }
#endif

/* _ca_reclaim_half(): reclaim from memoization cache.
*/
static void
Expand Down
70 changes: 70 additions & 0 deletions pkg/noun/palloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,28 @@
static u3_post _imalloc(c3_w);
static void _ifree(u3_post);

/* _box_count(): adjust free count and allocation high-water mark.
*/
#ifdef U3_CPU_DEBUG
static void
_box_count(c3_ws siz_ws)
{
u3R->all.fre_w += siz_ws;

{
c3_w end_w = u3a_heap(u3R);
c3_w all_w = (end_w - u3R->all.fre_w);

if ( all_w > u3R->all.max_w ) {
u3R->all.max_w = all_w;
}
}
}
#else
static void
_box_count(c3_ws siz_ws) { }
#endif

static __inline__ c3_w
_abs_dif(c3_w a_w, c3_w b_w)
{
Expand Down Expand Up @@ -277,6 +299,8 @@ _alloc_pages(c3_w siz_w) // num pages
u3_post pag_p;

if ( pag_w ) {
_box_count( -(c3_ws)(siz_w << u3a_page) );

// XX groace
//
pag_w -= HEAP.off_ws * (siz_w - 1);
Expand All @@ -297,6 +321,8 @@ _alloc_pages(c3_w siz_w) // num pages
pag_w = post_to_page(pag_p);
dir_u = u3to(u3p(u3a_crag), HEAP.pag_p);

_box_count(0); // heap extended, check high-water mark

#ifdef SANITY
assert( pag_w < HEAP.len_w );
assert( (pag_w + ((HEAP.off_ws + 1) * siz_w) - HEAP.off_ws) == HEAP.len_w );
Expand Down Expand Up @@ -338,6 +364,7 @@ _rake_chunks(c3_w len_w, c3_w max_w, c3_t rak_t, c3_w* out_w, u3_post* out_p)
u3_post pag_p = HEAP.wee_p[bit_g];
u3a_crag *pag_u;
c3_w hav_w = *out_w;
c3_w gav_w = hav_w;

if ( rak_t ) {
c3_w *map_w;
Expand Down Expand Up @@ -370,6 +397,7 @@ _rake_chunks(c3_w len_w, c3_w max_w, c3_t rak_t, c3_w* out_w, u3_post* out_p)
}

HEAP.wee_p[bit_g] = pag_p;
_box_count( -(c3_ws)((hav_w - gav_w) << hun_u->log_s) );
*out_w = hav_w;
return;
}
Expand Down Expand Up @@ -397,12 +425,15 @@ _rake_chunks(c3_w len_w, c3_w max_w, c3_t rak_t, c3_w* out_w, u3_post* out_p)

if ( hav_w == max_w ) {
HEAP.wee_p[bit_g] = pag_p;
_box_count( -(c3_ws)((hav_w - gav_w) << hun_u->log_s) );
*out_w = hav_w;
return;
}
}

HEAP.wee_p[bit_g] = 0;

_box_count( -(c3_ws)((hav_w - gav_w) << hun_u->log_s) );
}

// XX s/b ful_s
Expand Down Expand Up @@ -487,6 +518,8 @@ _make_chunks(c3_g bit_g) // 0-9, inclusive
pag_u->nex_p = HEAP.wee_p[bit_g];
HEAP.wee_p[bit_g] = hun_p;

_box_count( (c3_ws)((c3_w)hun_u->ful_s << hun_u->log_s) );

return hun_p;
}

Expand All @@ -513,6 +546,9 @@ _alloc_words(c3_w len_w) // 4-2.048, inclusive
}

pag_u->fre_s--;

_box_count( -(c3_ws)hun_u->len_s );

map_w = pag_u->map_w;
while ( !*map_w ) { map_w++; }

Expand Down Expand Up @@ -657,6 +693,10 @@ _free_pages(u3_post som_p, c3_w pag_w, u3_post dir_p)
u3R->hat_p -= HEAP.dir_ws * (c3_ws)(siz_w << u3a_page);
HEAP.len_w -= siz_w;

// coalesced free-list pages left the heap along with [wiz_w]
//
_box_count( -(c3_ws)((siz_w - wiz_w) << u3a_page) );

// fprintf(stderr, "shrink heap 0x%x 0x%x %u:%u (%u) 0x%x\r\n",
// som_p, som_p + (siz_w << u3a_page), pag_w, wiz_w, siz_w, u3R->hat_p);

Expand All @@ -676,6 +716,8 @@ _free_pages(u3_post som_p, c3_w pag_w, u3_post dir_p)

ASAN_POISON_MEMORY_REGION(u3a_into(som_p), siz_w << (u3a_page + 2));

_box_count( (c3_ws)(siz_w << u3a_page) );

// XX add temporary freelist entry?
// if ( !HEAP.cac_p && !HEAP.fre_p
// && !HEAP.wee_p[(c3_bits_word(c3_wiseof(*cac_u) - 1) - u3a_min_log)] )
Expand Down Expand Up @@ -817,6 +859,8 @@ _free_words(u3_post som_p, c3_w pag_w, u3_post dir_p)
pag_u->map_w[pos_w >> 5] |= (1U << (pos_w & 31));
pag_u->fre_s++;

_box_count( hun_u->len_s );

ASAN_POISON_MEMORY_REGION(u3a_into(som_p), hun_u->len_s << 2);

{
Expand Down Expand Up @@ -856,6 +900,10 @@ _free_words(u3_post som_p, c3_w pag_w, u3_post dir_p)

*bit_p = pag_u->nex_p;

// free chunks become a free page, counted in _free_pages()
//
_box_count( -(c3_ws)((c3_w)hun_u->ful_s << hun_u->log_s) );

dir_u[pag_u->pag_w] = u3a_head_pg;
som_p = page_to_post(pag_u->pag_w); // NB: clobbers
if ( som_p != dir_p ) {
Expand Down Expand Up @@ -1413,9 +1461,17 @@ _sweep_directory(void)
// entire chunk page is unmarked
//
if ( !(u3a_Mark.bit_w[blk_w] & (1U << bit_w)) ) {
// discount free chunks, the whole page is counted in _free_pages()
//
{
u3a_crag* pag_u = u3to(u3a_crag, dir_p);
_box_count( -(c3_ws)((c3_w)pag_u->fre_s << pag_u->log_s) );
}

if ( u3C.wag_w & u3o_verbose ) {
fprintf(stderr, "palloc: leaked chunk page %u\r\n", pag_w);
}

(void)_free_pages(page_to_post(pag_w), pag_w, u3a_head_pg);
leq_w += 1U << u3a_page;
}
Expand Down Expand Up @@ -1720,9 +1776,17 @@ _sweep_counts(void)
// entire chunk page is unmarked
//
if ( !(u3a_Mark.bit_w[blk_w] & (1U << bit_w)) ) {
// discount free chunks, the whole page is counted in _free_pages()
//
{
u3a_crag* pag_u = u3to(u3a_crag, dir_p);
_box_count( -(c3_ws)((c3_w)pag_u->fre_s << pag_u->log_s) );
}

if ( u3C.wag_w & u3o_verbose ) {
fprintf(stderr, "palloc: leaked chunk page %u\r\n", pag_w);
}

(void)_free_pages(page_to_post(pag_w), pag_w, u3a_head_pg);
leq_w += 1U << u3a_page;
}
Expand Down Expand Up @@ -2598,6 +2662,12 @@ _pack_move(void)

HEAP.erf_p = 0;

#ifdef U3_CPU_DEBUG
// free space was rearranged wholesale; recount
//
u3R->all.fre_w = (_idle_pages() << u3a_page) + _idle_words();
#endif

#ifdef PACK_CHECK
vt_cleanup(&pos_u);
#endif
Expand Down
Loading