ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-04 21:33:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

ifdef out watermark stuff

Browse Source
This commit is contained in:
Raymond Pasco 2015-07-15 15:14:11 -04:00
parent 47d3bcd918
commit ffd2abbbe8
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/noun/allocate.h
View File

@ -14,6 +14,9 @@
* U3_MEMORY_DEBUG is on, this should generally be on as well.
*/
# define U3_CELLOC_TOGGLE
/* U3_PRINT_WATERMARK: print watermark information for each road
*/
# undef U3_PRINT_WATERMARK
/** Constants.
**/

18
noun/allocate.c
View File

@ -11,7 +11,7 @@ _box_count(c3_ws siz_ws)
{
u3R->all.fre_w += siz_ws;
{
c3_w end_w = _(u3a_is_north(u3R))
c3_w end_w = _(u3a_is_north(u3R))
? (u3R->hat_p - u3R->rut_p)
: (u3R->rut_p - u3R->hat_p);
c3_w all_w = (end_w - u3R->all.fre_w);
@ -23,7 +23,7 @@ _box_count(c3_ws siz_ws)
}
#else
static void
_box_count(c3_ws siz_ws) {}
_box_count(c3_ws siz_ws) { u3R->all.fre_w += siz_ws; }
#endif
/* _box_slot(): select the right free list to search for a block.
@ -307,7 +307,9 @@ _ca_willoc(c3_w len_w, c3_w ald_w, c3_w alp_w)
** from the free list.
*/
siz_w += pad_w;
_box_count(-(box_u->siz_w));
#ifdef U3_MEMORY_DEBUG
_box_count(-(box_u->siz_w)); /* XX should this be ifdefed? */
#endif
{
{
c3_assert((0 == u3to(u3a_fbox, *pfr_p)->pre_p) ||
@ -1455,7 +1457,7 @@ c3_w
u3a_sweep(void)
{
c3_w neg_w, pos_w, leq_w, weq_w;
#ifdef U3_MEMORY_DEBUG
#ifdef U3_MEMORY_DEBUG
c3_w tot_w, caf_w;
#endif
@ -1480,10 +1482,12 @@ u3a_sweep(void)
fre_p = fre_u->nex_p;
}
}
#ifdef U3_PRINT_WATERMARK
if ( fre_w != u3R->all.fre_w ) {
fprintf(stderr, "fre discrepancy (%x): %x, %x, %x\r\n", u3R->par_p,
fre_w, u3R->all.fre_w, (u3R->all.fre_w - fre_w));
}
#endif
neg_w = (end_w - fre_w);
}
@ -1596,6 +1600,7 @@ u3a_sweep(void)
? u3R->mat_p - u3R->cap_p
: u3R->cap_p - u3R->mat_p;
#ifdef U3_PRINT_WATERMARK
if ( (0 != u3R->par_p) && (u3R->all.max_w > 1000000) ) {
u3a_print_memory("available", (tot_w - pos_w));
u3a_print_memory("allocated", pos_w);
@ -1603,6 +1608,11 @@ u3a_sweep(void)
u3a_print_memory("maximum", u3R->all.max_w);
}
#else
u3a_print_memory("available", (tot_w - pos_w));
u3a_print_memory("allocated", pos_w);
u3a_print_memory("volatile", caf_w);
#endif
#endif
u3a_print_memory("leaked", leq_w);
u3a_print_memory("weaked", weq_w);

10
noun/manage.c
View File

@ -576,11 +576,13 @@ u3m_bail(u3_noun how)
abort();
}
#ifdef U3_PRINT_WATERMARK
if ( c3__meme == how ) {
fprintf(stderr, "u3R %p, parent %x\n", u3R, u3R->par_p);
fprintf(stderr, "max %dMB\r\n", u3R->all.max_w / 256000);
fprintf(stderr, "max %dMB\r\n", u3R->all.max_w / 256000);
abort();
}
#endif
/* Printf some metadata.
*/
@ -728,7 +730,9 @@ u3m_leap(c3_w pad_w)
u3R = rod_u;
_pave_parts();
}
#ifdef U3_MEMORY_DEBUG
rod_u->all.fre_w = 0;
#endif
}
/* u3m_fall(): in u3R, return an inner road to its parent.
@ -878,9 +882,11 @@ u3m_soft_top(c3_w sec_w, // timer seconds
/* Make sure the inner routine did not create garbage.
*/
if ( u3C.wag_w & u3o_debug_ram ) {
#ifdef U3_PRINT_WATERMARK
if ( u3R->all.max_w > 1000000 ) {
fprintf(stderr, "soft_top: max %dMB\r\n", u3R->all.max_w / 256000);
}
#endif
u3m_grab(pro, u3_none);
}
@ -972,9 +978,11 @@ u3m_soft_run(u3_noun fly,
u3t_off(coy_o);
pro = fun_f(aga, agb);
#ifdef U3_PRINT_WATERMARK
if ( u3R->all.max_w > 1000000 ) {
fprintf(stderr, "soft_run: max %dMB\r\n", u3R->all.max_w / 256000);
}
#endif
/* Produce success, on the old road.
*/
pro = u3nc(0, u3m_love(pro));