diff --git a/pkg/urbit/daemon/main.c b/pkg/urbit/daemon/main.c index f4823888cd..0c747adeaf 100644 --- a/pkg/urbit/daemon/main.c +++ b/pkg/urbit/daemon/main.c @@ -1064,7 +1064,7 @@ _cw_serf_commence(c3_i argc, c3_c* argv[]) // { u3V.dir_c = strdup(dir_c); - u3V.sen_d = u3V.dun_d = u3m_boot(dir_c); + u3V.sen_d = u3V.dun_d = u3m_boot(dir_c, u3a_bytes); if ( eve_d ) { // XX need not be fatal, need a u3m_reboot equivalent @@ -1192,7 +1192,7 @@ _cw_eval(c3_i argc, c3_c* argv[]) u3_weak pil; u3C.wag_w |= u3o_hashless; - u3m_boot_lite(); + u3m_boot_lite(u3a_bytes); sil_u = u3s_cue_xeno_init_with(ur_fib27, ur_fib28); if ( u3_none == (pil = u3s_cue_xeno_with(sil_u, len_d, byt_y)) ) { printf("lite: unable to cue ivory pill\r\n"); @@ -1253,7 +1253,7 @@ _cw_info(c3_i argc, c3_c* argv[]) } break; } - c3_d eve_d = u3m_boot(u3_Host.dir_c); + c3_d eve_d = u3m_boot(u3_Host.dir_c, u3a_bytes); u3_disk* log_u = _cw_disk_init(u3_Host.dir_c); fprintf(stderr, "\r\nurbit: %s at event %" PRIu64 "\r\n", @@ -1290,7 +1290,7 @@ _cw_grab(c3_i argc, c3_c* argv[]) } break; } - u3m_boot(u3_Host.dir_c); + u3m_boot(u3_Host.dir_c, u3a_bytes); u3C.wag_w |= u3o_hashless; u3_serf_grab(); u3m_stop(); @@ -1319,7 +1319,7 @@ _cw_cram(c3_i argc, c3_c* argv[]) } break; } - c3_d eve_d = u3m_boot(u3_Host.dir_c); + c3_d eve_d = u3m_boot(u3_Host.dir_c, u3a_bytes); u3_disk* log_u = _cw_disk_init(u3_Host.dir_c); // XX s/b try_aquire lock c3_o ret_o; @@ -1381,7 +1381,7 @@ _cw_queu(c3_i argc, c3_c* argv[]) fprintf(stderr, "urbit: queu: preparing\r\n"); - u3m_boot(u3_Host.dir_c); + u3m_boot(u3_Host.dir_c, u3a_bytes); // XX can spuriously fail do to corrupt memory-image checkpoint, // need a u3m_half_boot equivalent @@ -1427,7 +1427,7 @@ _cw_meld(c3_i argc, c3_c* argv[]) c3_w pre_w; u3C.wag_w |= u3o_hashless; - u3m_boot(u3_Host.dir_c); + u3m_boot(u3_Host.dir_c, u3a_bytes); pre_w = u3a_open(u3R); u3u_meld(); @@ -1515,7 +1515,7 @@ _cw_pack(c3_i argc, c3_c* argv[]) u3_disk* log_u = _cw_disk_init(u3_Host.dir_c); // XX s/b try_aquire lock - u3m_boot(u3_Host.dir_c); + u3m_boot(u3_Host.dir_c, u3a_bytes); u3a_print_memory(stderr, "urbit: pack: gained", u3m_pack()); u3e_save(); @@ -1688,7 +1688,7 @@ _cw_vile(c3_i argc, c3_c* argv[]) // XX check if snapshot is stale? // - c3_d eve_d = u3m_boot(u3_Host.dir_c); + c3_d eve_d = u3m_boot(u3_Host.dir_c, u3a_bytes); u3_noun sam = u3nc(u3nc(u3_nul, u3_nul), u3nc(c3n, u3nq(c3__once, 'j', c3__vile, u3_nul))); u3_noun res = u3v_soft_peek(0, sam); @@ -1974,7 +1974,7 @@ main(c3_i argc, // starting u3m configures OpenSSL memory functions, so we must do it // before any OpenSSL allocations // - u3m_boot_lite(); + u3m_boot_lite(u3a_bytes); // Initialize OpenSSL for client and server // diff --git a/pkg/urbit/include/noun/manage.h b/pkg/urbit/include/noun/manage.h index a1ffb6495d..72e29f5330 100644 --- a/pkg/urbit/include/noun/manage.h +++ b/pkg/urbit/include/noun/manage.h @@ -6,12 +6,12 @@ /* u3m_boot(): start the u3 system. return next event, starting from 1. */ c3_d - u3m_boot(c3_c* dir_c); + u3m_boot(c3_c* dir_c, size_t len_i); /* u3m_boot_lite(): start without checkpointing. */ c3_d - u3m_boot_lite(void); + u3m_boot_lite(size_t len_i); /* u3m_stop(): graceful shutdown cleanup. */ void diff --git a/pkg/urbit/noun/manage.c b/pkg/urbit/noun/manage.c index 3dfb04000f..aa33b03287 100644 --- a/pkg/urbit/noun/manage.c +++ b/pkg/urbit/noun/manage.c @@ -1863,13 +1863,13 @@ u3m_stop() /* u3m_boot(): start the u3 system. return next event, starting from 1. */ c3_d -u3m_boot(c3_c* dir_c) +u3m_boot(c3_c* dir_c, size_t len_i) { c3_o nuu_o; /* Activate the loom. */ - u3m_init(u3a_bytes); + u3m_init(len_i); /* Activate the storage system. */ @@ -1915,11 +1915,11 @@ u3m_boot(c3_c* dir_c) /* u3m_boot_lite(): start without checkpointing. */ c3_d -u3m_boot_lite(void) +u3m_boot_lite(size_t len_i) { /* Activate the loom. */ - u3m_init(u3a_bytes); + u3m_init(len_i); /* Activate tracing. */ diff --git a/pkg/urbit/tests/noun_tests.c b/pkg/urbit/tests/noun_tests.c index b84b618652..3d1ee976d1 100644 --- a/pkg/urbit/tests/noun_tests.c +++ b/pkg/urbit/tests/noun_tests.c @@ -17,7 +17,7 @@ _setup(void) u3_weak pil; u3C.wag_w |= u3o_hashless; - u3m_boot_lite(); + u3m_boot_lite(u3a_bytes); sil_u = u3s_cue_xeno_init_with(ur_fib27, ur_fib28); if ( u3_none == (pil = u3s_cue_xeno_with(sil_u, len_d, byt_y)) ) { printf("*** fail _setup 1\n");