ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-28 11:40:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

vere: remove trailing newlines from u3l_log calls

Browse Source 
As of dc2c990 these are redundant. See also 9631be6.
This commit is contained in:
fang 2023-01-03 17:36:37 +01:00
parent a15111a35c
commit ceafb37042
No known key found for this signature in database
GPG Key ID: EB035760C1BBA972
13 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/urbit/daemon/main.c
View File

@ -588,7 +588,7 @@ _setup_cert_store()
{
BIO* cbio = BIO_new_mem_buf(include_ca_bundle_crt, include_ca_bundle_crt_len);
if ( !cbio || !(_cert_store = PEM_X509_INFO_read_bio(cbio, NULL, NULL, NULL)) ) {
u3l_log("boot: failed to decode embedded CA certificates\r\n");
u3l_log("boot: failed to decode embedded CA certificates");
exit(1);
}
@ -1286,7 +1286,7 @@ _cw_eval(c3_i argc, c3_c* argv[])
}
u3s_cue_xeno_done(sil_u);
if ( c3n == u3v_boot_lite(pil) ) {
u3l_log("lite: boot failed\r\n");
u3l_log("lite: boot failed");
exit(1);
}
}
@ -1896,7 +1896,7 @@ _cw_play(c3_i argc, c3_c* argv[])
u3C.wag_w |= u3o_hashless;
if ( c3y == ful_o ) {
u3l_log("mars: preparing for full replay\r\n");
u3l_log("mars: preparing for full replay");
u3m_init((size_t)1 << u3_Host.ops_u.lom_y);
u3e_live(u3m_pier(u3_Host.dir_c));
u3e_yolo();
@ -2074,7 +2074,7 @@ _cw_vere(c3_i argc, c3_c* argv[])
// initialize curl
//
if ( 0 != curl_global_init(CURL_GLOBAL_DEFAULT) ) {
u3l_log("boot: curl initialization failed\r\n");
u3l_log("boot: curl initialization failed");
exit(1);
}
@ -2104,11 +2104,11 @@ _cw_vere(c3_i argc, c3_c* argv[])
if ( u3_king_vere(pac_c, ver_c, arc_c, dir_c, 0) ) {
u3l_log("vere: download failed\r\n");
u3l_log("vere: download failed");
exit(1);
}
u3l_log("vere: download succeeded\r\n");
u3l_log("vere: download succeeded");
}
/* _cw_vile(): generatoe/print keyfile
@ -2461,7 +2461,7 @@ main(c3_i argc,
{
SECURITY_ATTRIBUTES sa = {sizeof(sa), NULL, TRUE};
if ( NULL == (u3_Host.cev_u = CreateEvent(&sa, FALSE, FALSE, NULL)) ) {
u3l_log("boot: failed to create Ctrl-C event: %d\r\n", GetLastError());
u3l_log("boot: failed to create Ctrl-C event: %d", GetLastError());
exit(1);
}
}

2
pkg/urbit/noun/log.c
View File

@ -33,7 +33,7 @@ u3_weak
u3l_punt(const char* name, u3_weak pro)
{
if ( u3_none == pro ) {
u3l_log("%s-punt\r\n", name);
u3l_log("%s-punt", name);
}
return pro;
}

10
pkg/urbit/noun/manage.c
View File

@ -434,7 +434,7 @@ u3m_signal(u3_noun sig_l)
u3_noun
u3m_file(c3_c* pas_c)
{
u3l_log("Loading file: %s\r\n", pas_c);
u3l_log("Loading file: %s", pas_c);
struct stat buf_b;
c3_i fid_i = c3_open(pas_c, O_RDONLY, 0644);
c3_w fln_w;
@ -445,7 +445,7 @@ u3m_file(c3_c* pas_c)
return u3m_bail(c3__fail);
}
fln_w = buf_b.st_size;
//u3l_log("file size: %i\r\n", fln_w);
//u3l_log("file size: %i", fln_w);
pad_y = c3_malloc(buf_b.st_size);
@ -460,7 +460,7 @@ u3m_file(c3_c* pas_c)
u3_noun pad = u3i_bytes(fln_w, (c3_y *)pad_y);
c3_free(pad_y);
//u3l_log("size of noun\r\n");
//u3l_log("size of noun");
//u3m_p("size", u3dc("met", 3, u3k(pad)));
return pad;
@ -1875,7 +1875,7 @@ _cm_crypto()
if ( 0 == CRYPTO_set_mem_functions(&_cm_malloc_ssl,
&_cm_realloc_ssl,
&_cm_free_ssl) ) {
u3l_log("%s\r\n", "openssl initialization failed");
u3l_log("%s", "openssl initialization failed");
abort();
}
@ -1918,7 +1918,7 @@ u3m_init(size_t len_i)
|| (len_i < (1 << (u3a_page + 2)))
|| (len_i > u3a_bytes) )
{
u3l_log("loom: bad size: %zu\r\n", len_i);
u3l_log("loom: bad size: %zu", len_i);
exit(1);
}

2
pkg/urbit/noun/vortex.c
View File

@ -208,7 +208,7 @@ u3v_lily(u3_noun fot, u3_noun txt, c3_l* tid_l)
(c3n == u3r_safe_word(q_uco, &wad_w)) ||
(wad_w & 0x80000000) )
{
u3l_log("strange lily %s\n", u3r_string(txt));
u3l_log("strange lily %s", u3r_string(txt));
u3z(txt); u3z(uco); return c3n;
}
else {

14
pkg/urbit/vere/disk.c
View File

@ -763,7 +763,7 @@ u3_disk_acquire(c3_c* pax_c)
if ( NULL != (loq_u = c3_fopen(paf_c, "r")) ) {
if ( 1 != fscanf(loq_u, "%" SCNu32, &pid_w) ) {
u3l_log("lockfile %s is corrupt!\n", paf_c);
u3l_log("lockfile %s is corrupt!", paf_c);
kill(getpid(), SIGTERM);
sleep(1); c3_assert(0);
}
@ -773,13 +773,13 @@ u3_disk_acquire(c3_c* pax_c)
int ret = kill(pid_w, SIGTERM);
if ( -1 == ret && errno == EPERM ) {
u3l_log("disk: permission denied when trying to kill process %d!\n", pid_w);
u3l_log("disk: permission denied when trying to kill process %d!", pid_w);
kill(getpid(), SIGTERM);
sleep(1); c3_assert(0);
}
if ( -1 != ret ) {
u3l_log("disk: stopping process %d, live in %s...\n",
u3l_log("disk: stopping process %d, live in %s...",
pid_w, pax_c);
for ( i_w = 0; i_w < 16; i_w++ ) {
@ -797,10 +797,10 @@ u3_disk_acquire(c3_c* pax_c)
}
}
if ( 16 == i_w ) {
u3l_log("disk: process %d seems unkillable!\n", pid_w);
u3l_log("disk: process %d seems unkillable!", pid_w);
c3_assert(0);
}
u3l_log("disk: stopped old process %u\n", pid_w);
u3l_log("disk: stopped old process %u", pid_w);
}
}
fclose(loq_u);
@ -808,7 +808,7 @@ u3_disk_acquire(c3_c* pax_c)
}
if ( NULL == (loq_u = c3_fopen(paf_c, "w")) ) {
u3l_log("disk: unable to open %s\n", paf_c);
u3l_log("disk: unable to open %s", paf_c);
c3_assert(0);
}
@ -856,7 +856,7 @@ u3_disk_exit(u3_disk* log_u)
if ( (c3y == log_u->ted_o)
&& (0 > uv_cancel(&log_u->req_u)) )
{
// u3l_log("disk: unable to cleanup\r\n");
// u3l_log("disk: unable to cleanup");
return;
}

4
pkg/urbit/vere/io/ames.c
View File

@ -726,7 +726,7 @@ _ames_ef_send(u3_ames* sam_u, u3_noun lan, u3_noun pac)
//
else if ( 0 == lan_u.por_s ) {
if ( u3C.wag_w & u3o_verbose ) {
u3l_log("ames: inscrutable lane\n");
u3l_log("ames: inscrutable lane");
}
_ames_pact_free(pac_u);
}
@ -1535,7 +1535,7 @@ _ames_io_slog(u3_auto* car_u)
u3l_log(" filtered (mug): %" PRIu64, sam_u->sat_u.mut_d);
u3l_log(" filtered (bod): %" PRIu64, sam_u->sat_u.bod_d);
u3l_log(" crashed: %" PRIu64, sam_u->sat_u.fal_d);
u3l_log(" cached lanes: %u\n", u3h_wyt(sam_u->lax_p));
u3l_log(" cached lanes: %u", u3h_wyt(sam_u->lax_p));
}
/* u3_ames_io_init(): initialize ames I/O.

34
pkg/urbit/vere/io/conn.c
View File

@ -333,7 +333,7 @@ _conn_moor_bail(void* ptr_v, ssize_t err_i, const c3_c* err_c)
u3_shan* san_u = can_u->san_u;
if ( err_i != UV_EOF ) {
u3l_log("conn: moor bail %zd %s\n", err_i, err_c);
u3l_log("conn: moor bail %zd %s", err_i, err_c);
if ( _(can_u->liv_o) ) {
_conn_send_noun(can_u, u3nq(0, c3__bail, u3i_word(err_i),
u3i_string(err_c)));
@ -573,7 +573,7 @@ _conn_moor_poke(void* ptr_v, c3_d len_d, c3_y* byt_y)
rud = u3dc("scot", c3__uv, u3k(rid));
tag_c = u3r_string(tag);
rid_c = u3r_string(rud);
u3l_log("conn: %s %s\n", tag_c, rid_c);
u3l_log("conn: %s %s", tag_c, rid_c);
c3_free(tag_c); c3_free(rid_c);
switch (tag) {
@ -690,7 +690,7 @@ _conn_init_sock(u3_shan* san_u)
c3_assert(!ret_i);
ret_i = uv_listen((uv_stream_t*)&san_u->pyp_u, 0, _conn_sock_cb);
c3_assert(!ret_i);
u3l_log("conn: listening on %s\n", pip_c);
u3l_log("conn: listening on %s", pip_c);
#else // _WIN32
// the full socket path is limited to about 108 characters,
@ -702,46 +702,46 @@ _conn_init_sock(u3_shan* san_u)
c3_i err_i;
if ( NULL == getcwd(pax_c, sizeof(pax_c)) ) {
u3l_log("conn: getcwd: %s\n", uv_strerror(errno));
u3l_log("conn: getcwd: %s", uv_strerror(errno));
u3_king_bail();
}
if ( 0 != chdir(u3_Host.dir_c) ) {
u3l_log("conn: chdir: %s\n", uv_strerror(errno));
u3l_log("conn: chdir: %s", uv_strerror(errno));
u3_king_bail();
}
if ( 0 != unlink(URB_SOCK_PATH) && errno != ENOENT ) {
u3l_log("conn: unlink: %s\n", uv_strerror(errno));
u3l_log("conn: unlink: %s", uv_strerror(errno));
goto _conn_sock_err_chdir;
}
if ( 0 != (err_i = uv_pipe_init(u3L, &san_u->pyp_u, 0)) ) {
u3l_log("conn: uv_pipe_init: %s\n", uv_strerror(err_i));
u3l_log("conn: uv_pipe_init: %s", uv_strerror(err_i));
goto _conn_sock_err_chdir;
}
if ( 0 != (err_i = uv_pipe_bind(&san_u->pyp_u, URB_SOCK_PATH)) ) {
u3l_log("conn: uv_pipe_bind: %s\n", uv_strerror(err_i));
u3l_log("conn: uv_pipe_bind: %s", uv_strerror(err_i));
goto _conn_sock_err_chdir;
}
if ( 0 != (err_i = uv_listen((uv_stream_t*)&san_u->pyp_u, 0,
_conn_sock_cb)) ) {
u3l_log("conn: uv_listen: %s\n", uv_strerror(err_i));
u3l_log("conn: uv_listen: %s", uv_strerror(err_i));
goto _conn_sock_err_unlink;
}
if ( 0 != chdir(pax_c) ) {
u3l_log("conn: chdir: %s\n", uv_strerror(errno));
u3l_log("conn: chdir: %s", uv_strerror(errno));
goto _conn_sock_err_close;
}
u3l_log("conn: listening on %s/%s\n", u3_Host.dir_c, URB_SOCK_PATH);
u3l_log("conn: listening on %s/%s", u3_Host.dir_c, URB_SOCK_PATH);
return;
_conn_sock_err_close:
uv_close((uv_handle_t*)&san_u->pyp_u, _conn_close_cb);
_conn_sock_err_unlink:
if ( 0 != unlink(URB_SOCK_PATH) ) {
u3l_log("conn: unlink: %s\n", uv_strerror(errno));
u3l_log("conn: unlink: %s", uv_strerror(errno));
}
_conn_sock_err_chdir:
if ( 0 != chdir(pax_c) ) {
u3l_log("conn: chdir: %s\n", uv_strerror(errno));
u3l_log("conn: chdir: %s", uv_strerror(errno));
}
u3_king_bail();
#endif // _WIN32
@ -764,7 +764,7 @@ _conn_born_news(u3_ovum* egg_u, u3_ovum_news new_e)
static void
_conn_born_bail(u3_ovum* egg_u, u3_noun lud)
{
u3l_log("conn: %%born failure; %%fyrd not supported\n");
u3l_log("conn: %%born failure; %%fyrd not supported");
u3z(lud);
u3_ovum_free(egg_u);
}
@ -820,7 +820,7 @@ _conn_ef_handle(u3_conn* con_u,
}
}
else {
u3l_log("conn: handle-no-coq %" PRIx32 " %" PRIu32 "\n",
u3l_log("conn: handle-no-coq %" PRIx32 " %" PRIu32,
sev_l, coq_l);
}
u3z(rid); u3z(tag); u3z(dat);
@ -866,11 +866,11 @@ _conn_io_exit(u3_auto* car_u)
if ( 0 != unlink(paf_c) ) {
if ( ENOENT != errno ) {
u3l_log("conn: failed to unlink socket: %s\n", uv_strerror(errno));
u3l_log("conn: failed to unlink socket: %s", uv_strerror(errno));
}
}
else {
// u3l_log("conn: unlinked %s\n", paf_c);
// u3l_log("conn: unlinked %s", paf_c);
}
c3_free(paf_c);

6
pkg/urbit/vere/io/http.c
View File

@ -1512,7 +1512,7 @@ _http_serv_start_err(const c3_c* cap_c, u3_http* htp_u, c3_i sas_i)
u3_pier* pir_u = htp_u->htd_u->car_u.pir_u;
if ( UV_EADDRNOTAVAIL == sas_i ) {
u3l_log("http: unavailable ip address %s\r\n", u3_Host.ops_u.bin_c);
u3l_log("http: unavailable ip address %s", u3_Host.ops_u.bin_c);
u3_king_bail();
return 0;
}
@ -1520,7 +1520,7 @@ _http_serv_start_err(const c3_c* cap_c, u3_http* htp_u, c3_i sas_i)
// ports specified, no incrementing/retry
//
if ( c3y == htp_u->dis ) {
u3l_log("http: %s (%" PRIu16 "): %s\n",
u3l_log("http: %s (%" PRIu16 "): %s",
cap_c, htp_u->por_s, uv_strerror(sas_i));
u3_king_bail();
return 0;
@ -1554,7 +1554,7 @@ _http_serv_start_err(const c3_c* cap_c, u3_http* htp_u, c3_i sas_i)
// total failure XX bail?
//
u3l_log("http: %s: %s\n", cap_c, uv_strerror(sas_i));
u3l_log("http: %s: %s", cap_c, uv_strerror(sas_i));
_http_serv_free(htp_u);
return 0;
}

8
pkg/urbit/vere/io/unix.c
View File

@ -293,7 +293,7 @@ _unix_mkdirp(c3_c* pax_c)
while ( fas_c ) {
*fas_c = 0;
if ( 0 != mkdir(pax_c, 0777) && EEXIST != errno ) {
u3l_log("unix: mkdir %s: %s\n", pax_c, strerror(errno));
u3l_log("unix: mkdir %s: %s", pax_c, strerror(errno));
u3m_bail(c3__fail);
}
*fas_c++ = '/';
@ -318,7 +318,7 @@ u3_unix_save(c3_c* pax_c, u3_atom pad)
c3_c* ful_c;
if ( !u3_unix_cane(pax_c) ) {
u3l_log("%s: non-canonical path\n", pax_c);
u3l_log("%s: non-canonical path", pax_c);
u3z(pad); u3m_bail(c3__fail);
}
if ( '/' == *pax_c) {
@ -333,7 +333,7 @@ u3_unix_save(c3_c* pax_c, u3_atom pad)
_unix_mkdirp(ful_c);
fid_i = c3_open(ful_c, O_WRONLY | O_CREAT | O_TRUNC, 0666);
if ( fid_i < 0 ) {
u3l_log("%s: %s\n", ful_c, strerror(errno));
u3l_log("%s: %s", ful_c, strerror(errno));
c3_free(ful_c);
u3z(pad); u3m_bail(c3__fail);
}
@ -347,7 +347,7 @@ u3_unix_save(c3_c* pax_c, u3_atom pad)
c3_free(pad_y);
if ( rit_i < 0 ) {
u3l_log("%s: %s\n", ful_c, strerror(errno));
u3l_log("%s: %s", ful_c, strerror(errno));
c3_free(ful_c);
u3m_bail(c3__fail);
}

46
pkg/urbit/vere/king.c
View File

@ -974,7 +974,7 @@ _king_save_file(c3_c* url_c, FILE* fil_u)
long cod_i;
if ( !(cul_u = curl_easy_init()) ) {
u3l_log("failed to initialize libcurl\n");
u3l_log("failed to initialize libcurl");
exit(1);
}
@ -988,11 +988,11 @@ _king_save_file(c3_c* url_c, FILE* fil_u)
// XX retry?
//
if ( CURLE_OK != res_i ) {
u3l_log("curl: failed %s: %s\n", url_c, curl_easy_strerror(res_i));
u3l_log("curl: failed %s: %s", url_c, curl_easy_strerror(res_i));
ret_i = -1;
}
if ( 300 <= cod_i ) {
u3l_log("curl: error %s: HTTP %ld\n", url_c, cod_i);
u3l_log("curl: error %s: HTTP %ld", url_c, cod_i);
ret_i = -2;
}
@ -1055,7 +1055,7 @@ _king_init_pace(c3_c* pac_c)
return 0;
}
else {
u3l_log("dock: init pace (%s): open %s\n", pac_c, strerror(errno));
u3l_log("dock: init pace (%s): open %s", pac_c, strerror(errno));
c3_free(bin_c);
return -1;
}
@ -1064,7 +1064,7 @@ _king_init_pace(c3_c* pac_c)
size_t len_i = strlen(pac_c);
ssize_t wit_i = c3_pwrite(fid_i, pac_c, len_i, 0);
if ( wit_i != len_i ) {
u3l_log("dock: init pace (%s) write failed: %s\n",
u3l_log("dock: init pace (%s) write failed: %s",
pac_c, strerror(errno));
close(fid_i);
c3_free(bin_c);
@ -1073,12 +1073,12 @@ _king_init_pace(c3_c* pac_c)
// XX sync first?
//
else if ( close(fid_i) ) {
u3l_log("dock: init pace (%s): close %s\n", pac_c, strerror(errno));
u3l_log("dock: init pace (%s): close %s", pac_c, strerror(errno));
c3_free(bin_c);
return 1;
}
u3l_log("dock: pace (%s): configured at %s/.bin/pace\r\n",
u3l_log("dock: pace (%s): configured at %s/.bin/pace",
pac_c, u3_Host.dir_c);
return 0;
@ -1138,12 +1138,12 @@ u3_king_vere(c3_c* pac_c, // pace
|| !(fil_u = fdopen(fid_i, "wb")) )
{
if ( EEXIST == errno ) {
u3l_log("already installed\n");
u3l_log("already installed");
c3_free(bin_c);
return 0;
}
else {
u3l_log("unable to open %s: %s\r\n", bin_c, strerror(errno));
u3l_log("unable to open %s: %s", bin_c, strerror(errno));
c3_free(bin_c);
return -1;
}
@ -1154,7 +1154,7 @@ u3_king_vere(c3_c* pac_c, // pace
c3_assert( ret_i > 0 );
if ( (ret_i = _king_save_file(url_c, fil_u)) ) {
u3l_log("unable to save %s to %s: %d\r\n", url_c, bin_c, ret_i);
u3l_log("unable to save %s to %s: %d", url_c, bin_c, ret_i);
c3_free(url_c);
fclose(fil_u);
unlink(bin_c);
@ -1187,7 +1187,7 @@ u3_king_vere(c3_c* pac_c, // pace
}
}
u3l_log("vere: saved to %s\n", bin_c);
u3l_log("vere: saved to %s", bin_c);
c3_free(url_c);
c3_free(bin_c);
@ -1210,13 +1210,13 @@ _king_do_upgrade(c3_c* pac_c, c3_c* ver_c)
arc_c = u3_Host.arc_c;
}
else {
u3l_log("vere: --arch required\r\n");
u3l_log("vere: --arch required");
return;
}
#endif
if ( _king_make_pace(pac_c) ) {
u3l_log("vere: unable to make pace (%s) directory in pier\n", pac_c);
u3l_log("vere: unable to make pace (%s) directory in pier", pac_c);
u3_king_bail();
exit(1);
}
@ -1229,13 +1229,13 @@ _king_do_upgrade(c3_c* pac_c, c3_c* ver_c)
// XX get link option
//
if ( u3_king_vere(pac_c, ver_c, arc_c, dir_c, 1) ) {
u3l_log("vere: upgrade failed\r\n");
u3l_log("vere: upgrade failed");
u3_king_bail();
exit(1);
}
c3_free(dir_c);
u3l_log("vere: upgrade succeeded\r\n");
u3l_log("vere: upgrade succeeded");
// XX print restart instructions
}
@ -1439,7 +1439,7 @@ u3_king_dock(c3_c* pac_c)
// XX get link option
//
if ( _king_copy_vere(pac_c, URBIT_VERSION, arc_c, 1) ) {
u3l_log("vere: binary copy failed\r\n");
u3l_log("vere: binary copy failed");
u3_king_bail();
exit(1);
}
@ -1447,7 +1447,7 @@ u3_king_dock(c3_c* pac_c)
// NB: failure ignored
//
_king_init_pace(pac_c);
u3l_log("vere: binary copy succeeded\r\n");
u3l_log("vere: binary copy succeeded");
// XX print restart instructions
}
}
@ -1477,10 +1477,10 @@ u3_king_done(void)
if ( u3_Host.xit_i ) {
if ( c3y == u3_Host.nex_o ) {
u3l_log("vere: upgrade failed\r\n");
u3l_log("vere: upgrade failed");
}
else if ( c3y == u3_Host.pep_o ) {
u3l_log("vere: prep for upgrade failed\r\n");
u3l_log("vere: prep for upgrade failed");
}
}
else {
@ -1498,15 +1498,15 @@ u3_king_done(void)
switch ( u3_king_next(pac_c, &ver_c) ) {
case -2: {
u3l_log("vere: unable to check for next version\n");
u3l_log("vere: unable to check for next version");
} break;
case -1: {
u3l_log("vere: up to date\n");
u3l_log("vere: up to date");
} break;
case 0: {
u3l_log("vere: next (%%%s): %s\n", pac_c, ver_c);
u3l_log("vere: next (%%%s): %s", pac_c, ver_c);
_king_do_upgrade(pac_c, ver_c);
c3_free(ver_c);
} break;
@ -1517,7 +1517,7 @@ u3_king_done(void)
c3_free(pac_c);
}
else if ( c3y == u3_Host.pep_o ) {
u3l_log("vere: ready for upgrade\n");
u3l_log("vere: ready for upgrade");
}
// copy binary into pier on boot

2
pkg/urbit/vere/lord.c
View File

@ -1056,7 +1056,7 @@ _lord_on_serf_err_cb(uv_stream_t* pyp_u,
uv_read_stop(pyp_u);
if ( siz_i != UV_EOF ) {
u3l_log("lord: serf stderr: %s\r\n", uv_strerror(siz_i));
u3l_log("lord: serf stderr: %s", uv_strerror(siz_i));
}
}

2
pkg/urbit/vere/pier.c
View File

@ -504,7 +504,7 @@ _pier_on_scry_done(void* ptr_v, u3_noun nun)
ext_c = "txt";
}
else {
u3l_log("pier: cannot export cell as %s\n", u3_Host.ops_u.puf_c);
u3l_log("pier: cannot export cell as %s", u3_Host.ops_u.puf_c);
out = u3_none;
}
u3z(puf);

24
pkg/urbit/worker/mars.c
View File

@ -128,15 +128,15 @@ _mars_do_boot(u3_disk* log_u, c3_d eve_d)
return c3n;
}
u3l_log("--------------- bootstrap starting ----------------\r\n");
u3l_log("--------------- bootstrap starting ----------------");
u3l_log("boot: 1-%u\r\n", u3qb_lent(eve));
u3l_log("boot: 1-%u", u3qb_lent(eve));
if ( c3n == u3v_boot(eve) ) {
return c3n;
}
u3l_log("--------------- bootstrap complete ----------------\r\n");
u3l_log("--------------- bootstrap complete ----------------");
return c3y;
}
@ -151,8 +151,8 @@ u3_mars_play(u3_mars* mar_u, c3_d eve_d)
eve_d = log_u->dun_d;
}
else if ( eve_d <= mar_u->dun_d ) {
u3l_log("mars: already computed %" PRIu64 "\r\n", eve_d);
u3l_log(" state=%" PRIu64 ", log=%" PRIu64 "\r\n",
u3l_log("mars: already computed %" PRIu64, eve_d);
u3l_log(" state=%" PRIu64 ", log=%" PRIu64,
mar_u->dun_d, log_u->dun_d);
return;
}
@ -181,23 +181,23 @@ u3_mars_play(u3_mars* mar_u, c3_d eve_d)
}
if ( mar_u->dun_d == log_u->dun_d ) {
u3l_log("mars: nothing to do!\r\n");
u3l_log("mars: nothing to do!");
return;
}
u3l_log("---------------- playback starting ----------------\r\n");
u3l_log("---------------- playback starting ----------------");
if ( (1ULL + eve_d) == log_u->dun_d ) {
u3l_log("play: event %" PRIu64 "\r\n", log_u->dun_d);
u3l_log("play: event %" PRIu64, log_u->dun_d);
}
else if ( eve_d != log_u->dun_d ) {
u3l_log("play: events %" PRIu64 "-%" PRIu64 " of %" PRIu64 "\r\n",
u3l_log("play: events %" PRIu64 "-%" PRIu64 " of %" PRIu64,
(c3_d)(1ULL + mar_u->dun_d),
eve_d,
log_u->dun_d);
}
else {
u3l_log("play: events %" PRIu64 "-%" PRIu64 "\r\n",
u3l_log("play: events %" PRIu64 "-%" PRIu64,
(c3_d)(1ULL + mar_u->dun_d),
eve_d);
}
@ -213,7 +213,7 @@ u3_mars_play(u3_mars* mar_u, c3_d eve_d)
//
switch ( _mars_play_batch(mar_u, c3y, 1024) ) {
case _play_yes_e: {
u3l_log("play (%" PRIu64 "): done\r\n", mar_u->dun_d);
u3l_log("play (%" PRIu64 "): done", mar_u->dun_d);
u3m_reclaim();
// XX save a snapshot every N events?
@ -262,6 +262,6 @@ u3_mars_play(u3_mars* mar_u, c3_d eve_d)
}
}
u3l_log("---------------- playback complete ----------------\r\n");
u3l_log("---------------- playback complete ----------------");
u3m_save();
}