Skip to content

Commit

Permalink
add u3m_pack() call to "fix" v2 -> v3 migration
Browse files Browse the repository at this point in the history
  • Loading branch information
matthew-levan committed Aug 29, 2023
1 parent 22e43a5 commit 1c53ccb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
3 changes: 0 additions & 3 deletions pkg/noun/jets.c
Original file line number Diff line number Diff line change
Expand Up @@ -2020,7 +2020,6 @@ u3a_jets
u3j_take(u3a_jets jed_u)
{
jed_u.war_p = u3h_take(jed_u.war_p);
u3l_log("u3j_take: set war_p: %p", u3a_into(jed_u.war_p));
jed_u.cod_p = u3h_take(jed_u.cod_p);
jed_u.han_p = u3h_take_with(jed_u.han_p, _cj_take_hank_cb);
jed_u.bas_p = u3h_take(jed_u.bas_p);
Expand Down Expand Up @@ -2187,7 +2186,6 @@ u3j_ream(void)
u3_assert(u3R == &(u3H->rod_u));
u3h_free(u3R->jed.war_p);
u3R->jed.war_p = u3h_new();
u3l_log("u3j_ream: set war_p: %p", u3a_into(u3R->jed.war_p));
u3h_walk_with(u3R->jed.cod_p, _cj_warm_tap, &rel);
_cj_ream(rel);
u3z(rel);
Expand Down Expand Up @@ -2413,7 +2411,6 @@ u3j_rewrite_compact()
}

u3R->jed.war_p = u3a_rewritten(u3R->jed.war_p);
u3l_log("u3j_rewrite_compact: set war_p: %p", u3a_into(u3R->jed.war_p));
u3R->jed.cod_p = u3a_rewritten(u3R->jed.cod_p);
u3R->jed.han_p = u3a_rewritten(u3R->jed.han_p);
u3R->jed.bas_p = u3a_rewritten(u3R->jed.bas_p);
Expand Down
6 changes: 2 additions & 4 deletions pkg/noun/manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,6 @@ _pave_parts(void)
u3R->cax.har_p = u3h_new_cache(u3C.hap_w); // transient
u3R->cax.per_p = u3h_new_cache(u3C.per_w); // persistent
u3R->jed.war_p = u3h_new();
u3l_log("_pave_parts: set war_p: %p", u3a_into(u3R->jed.war_p));
u3R->jed.cod_p = u3h_new();
u3R->jed.han_p = u3h_new();
u3R->jed.bas_p = u3h_new();
Expand Down Expand Up @@ -2149,7 +2148,6 @@ u3m_boot(c3_c* dir_c, size_t len_i)
*/
if ( c3n == nuu_o ) {
u3j_ream();
u3l_log("U3N_REAM");
u3n_ream();
// u3z_ream();
return u3A->eve_d;
Expand Down Expand Up @@ -2462,8 +2460,8 @@ _migrate_memoization()

u3H = (u3v_home*)hum_u;
u3R = &u3H->rod_u;
fprintf(stderr, "_migrate_memoization: jed: %p\r\n", &u3H->rod_u.jed);
fprintf(stderr, "_migrate_memoization: jed.war_p: %p\r\n", u3a_into(u3H->rod_u.jed.war_p));

u3m_pack();
}

/* u3m_migrate: perform loom migration if necessary.
Expand Down

0 comments on commit 1c53ccb

Please sign in to comment.