ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-15 18:12:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed a slew of memory leaks

Browse Source
This commit is contained in:
Philip C Monk 2015-05-05 19:42:00 -04:00
parent 12ed8c11af
commit 0a483a1b63
2 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
n/a.c
View File

@ -543,10 +543,10 @@ u3a_malloc(size_t len_i)
c3_w* out_w = u3a_into(ptr_p + pad_w + 1); c3_w* out_w = u3a_into(ptr_p + pad_w + 1);
#if 0 #if 0
if ( u3a_botox(out_w) == (u3a_box*)(void *)0x202320b88) { if ( u3a_botox(out_w) == (u3a_box*)(void *)0x3bdd1c80) {
static int xuc_i; static int xuc_i = 0;
printf("xuc_i %d\r\n", xuc_i); fprintf(stderr,"xuc_i %d\r\n", xuc_i);
// if ( 1 == xuc_i ) { abort(); } // if ( 1 == xuc_i ) { abort(); }
xuc_i++; xuc_i++;
} }
@ -561,6 +561,9 @@ u3a_malloc(size_t len_i)
c3_w* c3_w*
u3a_celloc(void) u3a_celloc(void)
{ {
#ifdef U3_MEMORY_DEBUG
return u3a_walloc(c3_wiseof(u3a_cell));
#else
u3p(u3a_fbox) cel_p; u3p(u3a_fbox) cel_p;
if ( (u3R == &(u3H->rod_u)) || !(cel_p = u3R->all.cel_p) ) { if ( (u3R == &(u3H->rod_u)) || !(cel_p = u3R->all.cel_p) ) {
@ -574,6 +577,7 @@ u3a_celloc(void)
return u3a_boxto(box_u); return u3a_boxto(box_u);
} }
#endif
} }
/* u3a_cfree(): free a cell. /* u3a_cfree(): free a cell.
@ -581,6 +585,9 @@ u3a_celloc(void)
void void
u3a_cfree(c3_w* cel_w) u3a_cfree(c3_w* cel_w)
{ {
#ifdef U3_MEMORY_DEBUG
return u3a_wfree(cel_w);
#else
if ( u3R == &(u3H->rod_u) ) { if ( u3R == &(u3H->rod_u) ) {
return u3a_wfree(cel_w); return u3a_wfree(cel_w);
} }
@ -591,6 +598,7 @@ u3a_cfree(c3_w* cel_w)
u3to(u3a_fbox, fre_p)->nex_p = u3R->all.cel_p; u3to(u3a_fbox, fre_p)->nex_p = u3R->all.cel_p;
u3R->all.cel_p = fre_p; u3R->all.cel_p = fre_p;
} }
#endif
} }
/* u3a_realloc(): aligned realloc in bytes. /* u3a_realloc(): aligned realloc in bytes.

51
v/unix.c
View File

@ -607,6 +607,8 @@ _unix_dir_update(u3_udir* dir_u, DIR* rid_u)
if ( ( NULL == strrchr(out_u->d_name, '.')) || if ( ( NULL == strrchr(out_u->d_name, '.')) ||
( '~' == out_u->d_name[strlen(out_u->d_name) - 1] ) ( '~' == out_u->d_name[strlen(out_u->d_name) - 1] )
) { ) {
free(pax_c);
free(pot_c);
continue; continue;
} }
@ -839,7 +841,7 @@ _unix_file_name(u3_ufil* fil_u)
/* _unix_dir_khan_file(): process a file for khan. /* _unix_dir_khan_file(): process a file for khan.
*/ */
static u3_noun static u3_noun
_unix_dir_khan_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz) _unix_dir_khan_file(u3_noun pam, u3_noun wib, u3_noun woz)
{ {
u3_weak ole; u3_weak ole;
if ( c3n == u3du(wib) ) { if ( c3n == u3du(wib) ) {
@ -912,9 +914,8 @@ _unix_dir_khan(u3_udir* dir_u)
if ( u3_nul != u3h(kan) || u3_nul != u3t(kan) ) { if ( u3_nul != u3h(kan) || u3_nul != u3t(kan) ) {
pam = u3kdb_put(pam, pre, kan); pam = u3kdb_put(pam, pre, kan);
} }
else else {
{ u3z(kan); u3z(pre);
u3z(kan);
} }
} }
@ -925,13 +926,12 @@ _unix_dir_khan(u3_udir* dir_u)
if ( u3_none == wib ) continue; if ( u3_none == wib ) continue;
u3_noun dur = _unix_dir_name(dir_u); u3_noun dur = _unix_dir_name(dir_u);
if ( c3n == u3r_sing(dur, u3h(wib)) ) { // wrong desk if ( c3n == u3r_sing(dur, u3h(wib)) ) { // wrong desk
u3z(wib); u3z(dur); u3z(dur); u3z(wib);
continue; continue;
} }
u3_noun baw = _unix_file_load(fil_u); u3_noun woz = u3nt(u3_nul, u3_nul, _unix_file_load(fil_u));
u3_noun woz = u3nt(u3_nul, u3_nul, baw); pam = _unix_dir_khan_file(pam, u3k(u3t(wib)), woz);
u3z(dur); u3z(dur);
pam = _unix_dir_khan_file(pam, u3k(u3t(wib)), baw, woz);
u3z(wib); u3z(wib);
} }
} }
@ -942,7 +942,7 @@ _unix_dir_khan(u3_udir* dir_u)
u3_noun wol = (c3__none == baw ? u3nc(u3_nul, u3_nul) : u3_noun wol = (c3__none == baw ? u3nc(u3_nul, u3_nul) :
u3_nul == baw ? u3_nul : u3_nul == baw ? u3_nul :
u3nt(u3_nul, u3_nul, baw)); u3nt(u3_nul, u3_nul, baw));
pam = _unix_dir_khan_file(pam, wib, baw, wol); pam = _unix_dir_khan_file(pam, wib, wol);
} }
return u3nc(u3_nul, pam); return u3nc(u3_nul, pam);
} }
@ -1085,6 +1085,8 @@ _unix_desk_sync_into(u3_noun who,
fav = u3nq(c3__into, who, syd, xun); fav = u3nq(c3__into, who, syd, xun);
u3v_plan(pax, fav); u3v_plan(pax, fav);
u3z(hox);
} }
/* _unix_ship_update(): update top level ship. /* _unix_ship_update(): update top level ship.
@ -1208,6 +1210,8 @@ _unix_pdir(u3_udir* par_u, u3_noun tet)
c3_w pax_w = strlen(par_u->pax_c); c3_w pax_w = strlen(par_u->pax_c);
u3_udir** dir_u; u3_udir** dir_u;
u3z(tet);
dir_u = &(par_u->dis_u); dir_u = &(par_u->dis_u);
while ( 1 ) { while ( 1 ) {
if ( !*dir_u || !strcmp(((*dir_u)->pax_c + pax_w + 1), tet_c) ) { if ( !*dir_u || !strcmp(((*dir_u)->pax_c + pax_w + 1), tet_c) ) {
@ -1340,7 +1344,7 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
#endif #endif
_unix_save(pax_c, u3k(u3t(mim))); _unix_save(pax_c, u3k(u3t(mim)));
_unix_save(pat_c, u3t(mim)); _unix_save(pat_c, u3k(u3t(mim)));
if ( *fil_u ) { if ( *fil_u ) {
(*fil_u)->dot_c = (pax_c + ((*fil_u)->dot_c - (*fil_u)->pax_c)); (*fil_u)->dot_c = (pax_c + ((*fil_u)->dot_c - (*fil_u)->pax_c));
@ -1370,12 +1374,12 @@ _unix_desk_sync_tako(u3_udir* dir_u, u3_noun pax, u3_noun mim)
if ( (c3n == u3du(pax)) ) { if ( (c3n == u3du(pax)) ) {
c3_assert(!"tack"); c3_assert(!"tack");
} }
else if ( c3n == u3du(u3t(pax)) ) { // at toplevel else if ( c3n == u3du(u3t(pax)) ) { // at toplevel
u3_noun i_pax = u3h(pax); u3_noun i_pax = u3h(pax);
u3_noun t_pax = u3t(pax); u3_noun t_pax = u3t(pax);
c3_c* par_u = strrchr(dir_u->pax_c, '/') + 1; c3_c* par_u = strrchr(dir_u->pax_c, '/') + 1;
u3_noun pem = u3i_string(par_u); u3_noun pem = u3i_string(par_u);
c3_assert( u3_nul == t_pax ); // XX ugly, wrong c3_assert( u3_nul == t_pax ); // XX ugly, wrong
_unix_desk_sync_tofu(dir_u->par_u, pem, u3k(i_pax), mim); _unix_desk_sync_tofu(dir_u->par_u, pem, u3k(i_pax), mim);
} }
@ -1402,15 +1406,18 @@ _unix_desk_sync_tako(u3_udir* dir_u, u3_noun pax, u3_noun mim)
u3z(pax); u3z(pax);
} }
/* _unix_desk_sync_soba(): sync computed changes. /* _unix_desk_sync_list(): sync computed changes.
*/ */
static void static void
_unix_desk_sync_list(u3_udir* dir_u, u3_noun can) _unix_desk_sync_list(u3_udir* dir_u, u3_noun can)
{ {
while ( u3_nul != can ) { u3_noun nac = can;
_unix_desk_sync_tako(dir_u, u3k(u3h(u3h(can))), u3k(u3t(u3h(can))));
can = u3t(can); while ( u3_nul != nac ) {
_unix_desk_sync_tako(dir_u, u3k(u3h(u3h(nac))), u3k(u3t(u3h(nac))));
nac = u3t(nac);
} }
u3z(can); u3z(can);
} }
@ -1423,6 +1430,10 @@ _unix_desk_sync_ergo(u3_noun hox,
u3_noun can, u3_noun can,
u3_uhot* hot_u) u3_uhot* hot_u)
{ {
#if 0
u3z(hox); u3z(syd); u3z(lok); u3z(can);
#else
u3_udir** dir_u = _unix_pdir(&(hot_u->dir_u), syd); u3_udir** dir_u = _unix_pdir(&(hot_u->dir_u), syd);
#if 0 #if 0
@ -1438,6 +1449,9 @@ _unix_desk_sync_ergo(u3_noun hox,
} }
_unix_desk_sync_list(*dir_u, can); _unix_desk_sync_list(*dir_u, can);
u3z(lok); u3z(syd); u3z(hox);
#endif
} }
/* u3_unix_ef_init(): update filesystem for new acquisition. /* u3_unix_ef_init(): update filesystem for new acquisition.
@ -1466,10 +1480,15 @@ u3_unix_ef_ergo(u3_noun who,
u3_uhot* hot_u; u3_uhot* hot_u;
hot_u = _unix_home(who); hot_u = _unix_home(who);
u3z(who);
if ( 0 != hot_u ) { if ( 0 != hot_u ) {
_unix_desk_sync_ergo(hox, syd, lok, can, hot_u); _unix_desk_sync_ergo(hox, syd, lok, can, hot_u);
} }
else
{
u3z(syd); u3z(syd); u3z(rel); u3z(can);
}
} }
/* u3_unix_ef_look(): update the root. /* u3_unix_ef_look(): update the root.