urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-20 17:32:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

u3: renames u3s_cue_sill* to u3s_cue_xeno*

Browse Source
This commit is contained in:
Joe Bryan 2020-09-18 12:04:04 -07:00
parent 5f8dcecbe3
commit c3a854363e
9 changed files with 67 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/urbit/bench/ur_bench.c
View File

@ -189,21 +189,21 @@ _cue_bench(void)
: (c3_y*)((u3a_atom*)u3a_to_ptr(vat))->buf_w;
for ( i_w = 0; i_w < max_w; i_w++ ) {
u3z(u3s_cue_sill(len_w, byt_y));
u3z(u3s_cue_xeno(len_w, byt_y));
}
}
gettimeofday(&f2, 0);
timersub(&f2, &b4, &d0);
mil_w = (d0.tv_sec * 1000) + (d0.tv_usec / 1000);
fprintf(stderr, " cue sill: %u ms\r\n", mil_w);
fprintf(stderr, " cue xeno: %u ms\r\n", mil_w);
}
{
gettimeofday(&b4, 0);
{
u3_cue_sill* sil_u = u3s_cue_sill_init();
u3_cue_xeno* sil_u = u3s_cue_xeno_init();
c3_w len_w = u3r_met(3, vat);
// XX assumes little-endian
@ -213,16 +213,16 @@ _cue_bench(void)
: (c3_y*)((u3a_atom*)u3a_to_ptr(vat))->buf_w;
for ( i_w = 0; i_w < max_w; i_w++ ) {
u3z(u3s_cue_sill_with(sil_u, len_w, byt_y));
u3z(u3s_cue_xeno_with(sil_u, len_w, byt_y));
}
u3s_cue_sill_done(sil_u);
u3s_cue_xeno_done(sil_u);
}
gettimeofday(&f2, 0);
timersub(&f2, &b4, &d0);
mil_w = (d0.tv_sec * 1000) + (d0.tv_usec / 1000);
fprintf(stderr, " cue sill with: %u ms\r\n", mil_w);
fprintf(stderr, " cue xeno with: %u ms\r\n", mil_w);
}
{

34
pkg/urbit/include/noun/serial.h
View File

@ -3,15 +3,9 @@
*/
/* opaque handles
*/
/* u3_cue_sill: handle for cue-ing with an off-loom dictionary.
/* u3_cue_xeno: handle for cue-ing with an off-loom dictionary.
*/
typedef struct _u3_cue_sill u3_cue_sill;
/* forward declarations
*/
/* ur_dict32_s: off-loom 32-bit dictionary.
*/
struct ur_dict32_s;
typedef struct _u3_cue_xeno u3_cue_xeno;
/* Noun serialization. All noun arguments RETAINED.
*/
@ -34,32 +28,32 @@
u3_noun
u3s_cue(u3_atom a);
/* u3s_cue_sill_init_with(): initialize a cue_sill handle as specified.
/* u3s_cue_xeno_init_with(): initialize a cue_xeno handle as specified.
*/
u3_cue_sill*
u3s_cue_sill_init_with(c3_d pre_d, c3_d siz_d);
u3_cue_xeno*
u3s_cue_xeno_init_with(c3_d pre_d, c3_d siz_d);
/* u3s_cue_sill_init(): initialize a cue_sill handle.
/* u3s_cue_xeno_init(): initialize a cue_xeno handle.
*/
u3_cue_sill*
u3s_cue_sill_init(void);
u3_cue_xeno*
u3s_cue_xeno_init(void);
/* u3s_cue_sill_init(): cue on-loom, with off-loom dictionary in handle.
/* u3s_cue_xeno_init(): cue on-loom, with off-loom dictionary in handle.
*/
u3_weak
u3s_cue_sill_with(u3_cue_sill* sil_u,
u3s_cue_xeno_with(u3_cue_xeno* sil_u,
c3_d len_d,
const c3_y* byt_y);
/* u3s_cue_sill_init(): dispose cue_sill handle.
/* u3s_cue_xeno_init(): dispose cue_xeno handle.
*/
void
u3s_cue_sill_done(u3_cue_sill* sil_u);
u3s_cue_xeno_done(u3_cue_xeno* sil_u);
/* u3s_cue_sill(): cue on-loom, with off-loom dictionary.
/* u3s_cue_xeno(): cue on-loom, with off-loom dictionary.
*/
u3_weak
u3s_cue_sill(c3_d len_d,
u3s_cue_xeno(c3_d len_d,
const c3_y* byt_y);
/* u3s_cue_bytes(): cue bytes onto the loom.

2
pkg/urbit/include/vere/vere.h
View File

@ -470,7 +470,7 @@
uv_process_t cub_u; // process handle
uv_process_options_t ops_u; // process configuration
uv_stdio_container_t cod_u[3]; // process options
u3_cue_sill* sil_u; // cue handle
u3_cue_xeno* sil_u; // cue handle
time_t wen_t; // process creation time
u3_mojo inn_u; // client's stdin
u3_moat out_u; // client's stdout

65
pkg/urbit/noun/serial.c
View File

@ -532,10 +532,10 @@ u3s_cue(u3_atom a)
return pro;
}
/* _cs_cue_sill_back(): cue a backref, off-loom dictionary.
/* _cs_cue_xeno_back(): cue a backref, off-loom dictionary.
*/
static inline ur_cue_res_e
_cs_cue_sill_back(ur_bsr_t* red_u,
_cs_cue_xeno_back(ur_bsr_t* red_u,
ur_dict32_t* dic_u,
u3_noun* out)
{
@ -562,10 +562,10 @@ _cs_cue_sill_back(ur_bsr_t* red_u,
}
}
/* _cs_cue_sill_atom(): cue an atom, off-loom dictionary.
/* _cs_cue_xeno_atom(): cue an atom, off-loom dictionary.
*/
static inline ur_cue_res_e
_cs_cue_sill_atom(ur_bsr_t* red_u,
_cs_cue_xeno_atom(ur_bsr_t* red_u,
ur_dict32_t* dic_u,
c3_d bit_d,
u3_noun* out)
@ -619,11 +619,10 @@ typedef struct _cue_frame_s {
c3_d bit_d;
} _cue_frame_t;
/* _cs_cue_sill_next(): read next value from bitstream, dictionary off-loom.
** NB: this is _cs_cue_xeno_next, using the road stack.
/* _cs_cue_xeno_next(): read next value from bitstream, dictionary off-loom.
*/
static inline ur_cue_res_e
_cs_cue_sill_next(u3a_pile* pil_u,
_cs_cue_xeno_next(u3a_pile* pil_u,
ur_bsr_t* red_u,
ur_dict32_t* dic_u,
u3_noun* out)
@ -650,24 +649,24 @@ _cs_cue_sill_next(u3a_pile* pil_u,
}
case ur_jam_back: {
return _cs_cue_sill_back(red_u, dic_u, out);
return _cs_cue_xeno_back(red_u, dic_u, out);
}
case ur_jam_atom: {
return _cs_cue_sill_atom(red_u, dic_u, bit_d, out);
return _cs_cue_xeno_atom(red_u, dic_u, bit_d, out);
}
}
}
}
struct _u3_cue_sill {
struct _u3_cue_xeno {
ur_dict32_t dic_u;
};
/* _cs_cue_sill(): cue on-loom, with off-loom dictionary in handle.
/* _cs_cue_xeno(): cue on-loom, with off-loom dictionary in handle.
*/
static u3_weak
_cs_cue_sill(u3_cue_sill* sil_u,
_cs_cue_xeno(u3_cue_xeno* sil_u,
c3_d len_d,
const c3_y* byt_y)
{
@ -695,7 +694,7 @@ _cs_cue_sill(u3_cue_sill* sil_u,
// advance into stream
//
res_e = _cs_cue_sill_next(&pil_u, &red_u, dic_u, &ref);
res_e = _cs_cue_xeno_next(&pil_u, &red_u, dic_u, &ref);
// process cell results
//
@ -709,7 +708,7 @@ _cs_cue_sill(u3_cue_sill* sil_u,
//
if ( u3_none == fam_u->ref ) {
fam_u->ref = ref;
res_e = _cs_cue_sill_next(&pil_u, &red_u, dic_u, &ref);
res_e = _cs_cue_xeno_next(&pil_u, &red_u, dic_u, &ref);
fam_u = u3a_peek(&pil_u);
}
// f is a tail-frame; pop the stack and continue
@ -744,12 +743,12 @@ _cs_cue_sill(u3_cue_sill* sil_u,
return u3_none;
}
/* u3s_cue_sill_init_with(): initialize a cue_sill handle as specified.
/* u3s_cue_xeno_init_with(): initialize a cue_xeno handle as specified.
*/
u3_cue_sill*
u3s_cue_sill_init_with(c3_d pre_d, c3_d siz_d)
u3_cue_xeno*
u3s_cue_xeno_init_with(c3_d pre_d, c3_d siz_d)
{
u3_cue_sill* sil_u;
u3_cue_xeno* sil_u;
c3_assert( &(u3H->rod_u) == u3R );
@ -759,18 +758,18 @@ u3s_cue_sill_init_with(c3_d pre_d, c3_d siz_d)
return sil_u;
}
/* u3s_cue_sill_init(): initialize a cue_sill handle.
/* u3s_cue_xeno_init(): initialize a cue_xeno handle.
*/
u3_cue_sill*
u3s_cue_sill_init(void)
u3_cue_xeno*
u3s_cue_xeno_init(void)
{
return u3s_cue_sill_init_with(ur_fib10, ur_fib11);
return u3s_cue_xeno_init_with(ur_fib10, ur_fib11);
}
/* u3s_cue_sill_init(): cue on-loom, with off-loom dictionary in handle.
/* u3s_cue_xeno_init(): cue on-loom, with off-loom dictionary in handle.
*/
u3_weak
u3s_cue_sill_with(u3_cue_sill* sil_u,
u3s_cue_xeno_with(u3_cue_xeno* sil_u,
c3_d len_d,
const c3_y* byt_y)
{
@ -778,34 +777,34 @@ u3s_cue_sill_with(u3_cue_sill* sil_u,
c3_assert( &(u3H->rod_u) == u3R );
som = _cs_cue_sill(sil_u, len_d, byt_y);
som = _cs_cue_xeno(sil_u, len_d, byt_y);
ur_dict32_wipe(&sil_u->dic_u);
return som;
}
/* u3s_cue_sill_init(): dispose cue_sill handle.
/* u3s_cue_xeno_init(): dispose cue_xeno handle.
*/
void
u3s_cue_sill_done(u3_cue_sill* sil_u)
u3s_cue_xeno_done(u3_cue_xeno* sil_u)
{
ur_dict_free((ur_dict_t*)&sil_u->dic_u);
c3_free(sil_u);
}
/* u3s_cue_sill(): cue on-loom, with off-loom dictionary.
/* u3s_cue_xeno(): cue on-loom, with off-loom dictionary.
*/
u3_weak
u3s_cue_sill(c3_d len_d,
u3s_cue_xeno(c3_d len_d,
const c3_y* byt_y)
{
u3_cue_sill* sil_u;
u3_cue_xeno* sil_u;
u3_weak som;
c3_assert( &(u3H->rod_u) == u3R );
sil_u = u3s_cue_sill_init();
som = _cs_cue_sill(sil_u, len_d, byt_y);
u3s_cue_sill_done(sil_u);
sil_u = u3s_cue_xeno_init();
som = _cs_cue_xeno(sil_u, len_d, byt_y);
u3s_cue_xeno_done(sil_u);
return som;
}

6
pkg/urbit/noun/urth.c
View File

@ -842,11 +842,11 @@ u3u_uncram(c3_c* dir_c, c3_d eve_d)
{
// XX tune the initial dictionary size for less reallocation
//
u3_cue_sill* sil_u = u3s_cue_sill_init_with(ur_fib33, ur_fib34);
u3_weak ref = u3s_cue_sill_with(sil_u, len_d, byt_y);
u3_cue_xeno* sil_u = u3s_cue_xeno_init_with(ur_fib33, ur_fib34);
u3_weak ref = u3s_cue_xeno_with(sil_u, len_d, byt_y);
u3_noun roc, cod;
u3s_cue_sill_done(sil_u);
u3s_cue_xeno_done(sil_u);
if ( u3_none == ref ) {
fprintf(stderr, "uncram: failed to cue rock\r\n");

2
pkg/urbit/tests/jam_tests.c
View File

@ -389,7 +389,7 @@ _test_cue_spec(const c3_c* cap_c,
{
u3_noun out;
if ( u3_none == (out = u3s_cue_sill(len_w, byt_y)) ) {
if ( u3_none == (out = u3s_cue_xeno(len_w, byt_y)) ) {
fprintf(stderr, "\033[31mcue %s fail 3\033[0m\r\n", cap_c);
ret_i = 0;
}

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

@ -713,15 +713,15 @@ _king_boot_ivory(void)
}
{
u3_cue_sill* sil_u = u3s_cue_sill_init_with(ur_fib27, ur_fib28);
u3_cue_xeno* sil_u = u3s_cue_xeno_init_with(ur_fib27, ur_fib28);
u3_weak pil;
if ( u3_none == (pil = u3s_cue_sill_with(sil_u, len_d, byt_y)) ) {
if ( u3_none == (pil = u3s_cue_xeno_with(sil_u, len_d, byt_y)) ) {
u3l_log("lite: unable to cue ivory pill\r\n");
exit(1);
}
u3s_cue_sill_done(sil_u);
u3s_cue_xeno_done(sil_u);
if ( c3n == u3v_boot_lite(pil)) {
u3l_log("lite: boot failed\r\n");

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

@ -74,7 +74,7 @@ _lord_stop_cb(void* ptr_v,
void (*exit_f)(void*) = god_u->cb_u.exit_f;
void* exit_v = god_u->cb_u.ptr_v;
u3s_cue_sill_done(god_u->sil_u);
u3s_cue_xeno_done(god_u->sil_u);
c3_free(god_u);
if ( exit_f ) {
@ -682,7 +682,7 @@ _lord_on_plea(void* ptr_v, c3_d len_d, c3_y* byt_y)
u3t_event_trace("king ipc cue", 'B');
#endif
jar = u3s_cue_sill_with(god_u->sil_u, len_d, byt_y);
jar = u3s_cue_xeno_with(god_u->sil_u, len_d, byt_y);
#ifdef LORD_TRACE_CUE
u3t_event_trace("king ipc cue", 'E');
@ -1169,7 +1169,7 @@ u3_lord_init(c3_c* pax_c, c3_w wag_w, c3_d key_d[4], u3_lord_cb cb_u)
#endif
{
god_u->sil_u = u3s_cue_sill_init();
god_u->sil_u = u3s_cue_xeno_init();
}
// start reading from proc

8
pkg/urbit/worker/main.c
View File

@ -27,7 +27,7 @@
static u3_serf u3V; // one serf per process
static u3_moat inn_u; // input stream
static u3_mojo out_u; // output stream
static u3_cue_sill* sil_u; // cue handle
static u3_cue_xeno* sil_u; // cue handle
#undef SERF_TRACE_JAM
#undef SERF_TRACE_CUE
@ -116,7 +116,7 @@ _cw_serf_writ(void* vod_p, c3_d len_d, c3_y* byt_y)
u3t_event_trace("serf ipc cue", 'B');
#endif
jar = u3s_cue_sill_with(sil_u, len_d, byt_y);
jar = u3s_cue_xeno_with(sil_u, len_d, byt_y);
#ifdef SERF_TRACE_CUE
u3t_event_trace("serf ipc cue", 'E');
@ -162,7 +162,7 @@ _cw_serf_stdio(c3_i* inn_i, c3_i* out_i)
static void
_cw_serf_exit(void)
{
u3s_cue_sill_done(sil_u);
u3s_cue_xeno_done(sil_u);
u3t_trace_close();
}
@ -236,7 +236,7 @@ _cw_serf_commence(c3_i argc, c3_c* argv[])
uv_stream_set_blocking((uv_stream_t*)&out_u.pyp_u, 1);
}
sil_u = u3s_cue_sill_init();
sil_u = u3s_cue_xeno_init();
// set up writing
//