Thanks to visit codestin.com
Credit goes to github.com

Skip to content

cleans up some printf edge-cases on cc-release #1291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 13, 2019
Merged

cleans up some printf edge-cases on cc-release #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3507e5d
removes u3l_log() from critical error-handling code paths
joemfb Jun 12, 2019
1f15266
enable ivory slog printfs during dawn (ethereum pre-boot validation)
joemfb Jun 12, 2019
6557fa1
removes u3l_log from u3m_bail() and c3_assert()
joemfb Jun 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/urbit/include/c/defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
# define c3_assert(x) \
do { \
if (!(x)) { \
u3l_log("\rAssertion '%s' failed " \
"in %s:%d\n", \
fprintf(stderr, "\rAssertion '%s' " \
"failed in %s:%d\n", \
#x, __FILE__, __LINE__); \
c3_cooked(); \
assert(x); \
Expand Down
7 changes: 5 additions & 2 deletions pkg/urbit/noun/allocate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,15 +370,18 @@ u3a_reflux(void)
void
u3a_reclaim(void)
{
// XX u3l_log avoid here, as it can
// cause problems when handling errors

if ( (0 == u3R->cax.har_p) ||
(0 == u3to(u3h_root, u3R->cax.har_p)->use_w) )
{
u3l_log("allocate: reclaim: memo cache: empty\r\n");
fprintf(stderr, "allocate: reclaim: memo cache: empty\r\n");
u3m_bail(c3__meme);
}

#if 1
u3l_log("allocate: reclaim: half of %d entries\r\n",
fprintf(stderr, "allocate: reclaim: half of %d entries\r\n",
u3to(u3h_root, u3R->cax.har_p)->use_w);

u3h_trim_to(u3R->cax.har_p, u3to(u3h_root, u3R->cax.har_p)->use_w / 2);
Expand Down
11 changes: 7 additions & 4 deletions pkg/urbit/noun/events.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,14 @@ u3e_fault(void* adr_v, c3_i ser_i)
return 0;
}

// XX u3l_log avoid here, as it can
// cause problems when handling errors

c3_w* adr_w = (c3_w*) adr_v;

if ( (adr_w < u3_Loom) || (adr_w >= (u3_Loom + u3a_words)) ) {
u3l_log("address %p out of loom!\r\n", adr_v);
u3l_log("loom: [%p : %p)\r\n", u3_Loom, u3_Loom + u3a_words);
fprintf(stderr, "address %p out of loom!\r\n", adr_v);
fprintf(stderr, "loom: [%p : %p)\r\n", u3_Loom, u3_Loom + u3a_words);
c3_assert(0);
return 0;
}
Expand All @@ -143,7 +146,7 @@ u3e_fault(void* adr_v, c3_i ser_i)
#endif

if ( 0 != (u3P.dit_w[blk_w] & (1 << bit_w)) ) {
u3l_log("strange page: %d, at %p, off %x\r\n",
fprintf(stderr, "strange page: %d, at %p, off %x\r\n",
pag_w, adr_w, off_w);
abort();
}
Expand All @@ -155,7 +158,7 @@ u3e_fault(void* adr_v, c3_i ser_i)
(1 << (u3a_page + 2)),
(PROT_READ | PROT_WRITE)) )
{
u3l_log("loom: fault mprotect: %s\r\n", strerror(errno));
fprintf(stderr, "loom: fault mprotect: %s\r\n", strerror(errno));
c3_assert(0);
return 0;
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/urbit/noun/manage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,11 +629,11 @@ u3m_bail(u3_noun how)
str_c[2] = ((how >> 16) & 0xff);
str_c[3] = ((how >> 24) & 0xff);
str_c[4] = 0;
u3l_log("\r\nbail: %s\r\n", str_c);
fprintf(stderr, "\r\nbail: %s\r\n", str_c);
}
else {
c3_assert(_(u3ud(u3h(how))));
u3l_log("\r\nbail: %d\r\n", u3h(how));
fprintf(stderr, "\r\nbail: %d\r\n", u3h(how));
}
}

Expand All @@ -643,7 +643,7 @@ u3m_bail(u3_noun how)
}

case c3__meme: {
u3l_log("bailing out\r\n");
fprintf(stderr, "bailing out\r\n");
abort();
}
case c3__exit: {
Expand All @@ -659,7 +659,7 @@ u3m_bail(u3_noun how)
}
case c3__foul:
case c3__oops:
u3l_log("bailing out\r\n");
fprintf(stderr, "bailing out\r\n");
assert(0);
}

Expand Down
15 changes: 15 additions & 0 deletions pkg/urbit/vere/daemon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,12 +331,27 @@ _daemon_come(u3_noun star, u3_noun pill, u3_noun path)
_daemon_dawn(u3_dawn_come(), pill, path);
}

static void
_daemon_slog(u3_noun hod)
{
u3_pier_tank(0, u3k(u3t(hod)));
u3z(hod);
}

/* _daemon_dawn(): boot from keys, validating
*/
void
_daemon_dawn(u3_noun seed, u3_noun pill, u3_noun path)
{
// enable ivory slog printfs
//
u3C.slog_f = _daemon_slog;

u3_pier_boot(sag_w, u3k(u3h(seed)), u3_dawn_vent(seed), pill, path);

// disable ivory slog printfs
//
u3C.slog_f = 0;
}

/* _daemon_exit(): exit parser
Expand Down