ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-01 19:46:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

moved path prettyprinting into noun/manage, and made it globally available

Browse Source
This commit is contained in:
Isaac Visintainer 2019-03-10 13:46:59 -07:00
parent 03ae60505b
commit cf3ddef76a
3 changed files with 56 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/urbit/include/noun/manage.h
View File

@ -122,6 +122,11 @@
c3_c*
u3m_pretty(u3_noun som);
/* u3m_pretty_path(): prettyprint a path to string. RETAIN.
*/
c3_c*
u3m_pretty_path(u3_noun som);
/* u3m_p(): dumb print with caption. RETAIN.
*/
void

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

@ -1369,6 +1369,56 @@ u3m_pretty(u3_noun som)
return pre_c;
}
/* _cm_in_pretty_path: measure/cut prettyprint.
*
* Modeled after _cm_in_pretty(), the backend to u3m_p(), but with the
* assumption that we're always displaying a path.
*/
static c3_w
_cm_in_pretty_path(u3_noun som, c3_c* str_c)
{
if ( _(u3du(som)) ) {
c3_w sel_w, one_w, two_w;
if ( str_c ) {
*(str_c++) = '/';
}
sel_w = 1;
one_w = _cm_in_pretty_path(u3h(som), str_c);
if ( str_c ) {
str_c += one_w;
}
two_w = _cm_in_pretty_path(u3t(som), str_c);
if ( str_c ) {
str_c += two_w;
}
return sel_w + one_w + two_w;
}
else {
c3_w len_w = u3r_met(3, som);
if ( str_c && len_w ) {
u3r_bytes(0, len_w, (c3_y *)str_c, som);
str_c += len_w;
}
return len_w;
}
}
/* u3m_pretty_path(): prettyprint a path to string.
*/
c3_c*
u3m_pretty_path(u3_noun som)
{
c3_w len_w = _cm_in_pretty_path(som, NULL);
c3_c* pre_c = malloc(len_w + 1);
_cm_in_pretty_path(som, pre_c);
pre_c[len_w] = 0;
return pre_c;
}
/* u3m_p(): dumb print with caption.
*/
void

50
pkg/urbit/noun/trace.c
View File

@ -433,54 +433,6 @@ u3t_nock_trace_push(u3_noun lab)
}
}
/* _in_trace_pretty: measure/cut prettyprint.
*
* Modeled after _cm_in_pretty(), the backend to u3m_p(), but with the
* assumption that we're always displaying a path.
*/
static c3_w
_in_trace_pretty(u3_noun som, c3_c* str_c)
{
if ( _(u3du(som)) ) {
c3_w sel_w, one_w, two_w;
if ( str_c ) {
*(str_c++) = '/';
}
sel_w = 1;
one_w = _in_trace_pretty(u3h(som), str_c);
if ( str_c ) {
str_c += one_w;
}
two_w = _in_trace_pretty(u3t(som), str_c);
if ( str_c ) {
str_c += two_w;
}
return sel_w + one_w + two_w;
}
else {
c3_w len_w = u3r_met(3, som);
if ( str_c && len_w ) {
u3r_bytes(0, len_w, (c3_y *)str_c, som);
str_c += len_w;
}
return len_w;
}
}
static c3_c*
trace_pretty(u3_noun som)
{
c3_w len_w = _in_trace_pretty(som, NULL);
c3_c* pre_c = malloc(len_w + 1);
_in_trace_pretty(som, pre_c);
pre_c[len_w] = 0;
return pre_c;
}
/* u3t_nock_trace_pop(): pops a trace from the trace stack.
*
* When we remove the trace from the stack, we check to see if the sample is
@ -503,7 +455,7 @@ u3t_nock_trace_pop()
// 33microseconds (a 30th of a millisecond).
c3_d duration = u3t_trace_time() - start_time;
if (duration > 33) {
c3_c* name = trace_pretty(lab);
c3_c* name = u3m_pretty_path(lab);
fprintf(u3_Host.tra_u.fil_u,
"{\"cat\": \"nock\", \"name\": \"%s\", \"ph\":\"%c\", \"pid\": %d, "