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

updates boot sequence to first configure serf

Browse Source
This commit is contained in:
Joe Bryan 2019-02-10 23:24:10 -05:00
parent 35d18c2b83
commit cdc9f7880c
2 changed files with 84 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vere/pier.c
View File

@ -93,6 +93,20 @@ _pier_work_bail(void* vod_p,
{
fprintf(stderr, "pier: work error: %s\r\n", err_c);
}
/* _pier_work_boot(): prepare serf boot.
*/
static void
_pier_work_boot(u3_pier* pir_u, c3_d len_d, c3_o fak_o)
{
u3_lord* god_u = pir_u->god_u;
u3_noun who = u3i_chubs(2, pir_u->who_d);
u3_noun len = u3i_chubs(1, &len_d);
u3_noun msg = u3nq(c3__boot, who, fak_o, len);
u3_newt_write(&god_u->inn_u, u3ke_jam(msg), 0);
}
/* _pier_disk_shutdown(): close the log.
*/
@ -963,6 +977,18 @@ _pier_boot_vent(u3_pier* pir_u)
}
}
// prepare serf for boot sequence
//
{
c3_o fak_o = ( c3__fake == u3h(pir_u->bot) ) ? c3y : c3n;
_pier_work_boot(pir_u, pir_u->but_d, fak_o);
fprintf(stderr, "boot: ship: %s%s\r\n",
pir_u->who_c,
(c3y == u3A->fak) ? " (fake)" : "");
}
// insert the module sequence as normally events
//
// i.e., will be (pair @da ovum), as will all the following
@ -2057,8 +2083,6 @@ u3_pier_boot(c3_w wag_w, // config flags
u3_noun how = u3dc("scot", 'p', u3k(who));
pir_u->who_c = u3r_string(how);
fprintf(stderr, "boot: ship: %s\r\n", pir_u->who_c);
u3z(how);
}

97
vere/serf.c
View File

@ -25,6 +25,7 @@
#include <vere/vere.h>
typedef struct _u3_serf {
c3_w len_w; // boot sequence length
c3_d evt_d; // last event processed
c3_l mug_l; // hash of state
c3_d key_d[4]; // disk key
@ -74,7 +75,14 @@
:: +writ: from lord to serf
::
+$ writ
$% :: exit immediately
$% :: prepare to boot
::
:: p: identity
:: q: fake?
:: r: number of boot formulas
::
[%boot p=@p q=? r=@]
:: exit immediately
::
:: p: exit code
::
@ -360,34 +368,6 @@ _serf_sure(u3_noun ovo, u3_noun vir, u3_noun cor)
u3z(u3A->roc);
u3A->roc = cor;
// single-home
//
// XX revise when real keys are supported
// XX dispatch on evt_d, wire, or card tag?
//
if ( c3__boot == u3h(u3t(ovo)) ) {
// ovo=[%boot *]
// vir=[[wire %init @p] ~]
// fec=[%init @p]
//
u3_noun fec = u3t(u3h(vir));
c3_assert( c3__init == u3h(fec) );
c3_assert( u3_none == u3A->our );
u3A->our = u3k(u3t(fec));
u3A->fak = ( c3__fake == u3h(u3t(u3t(ovo))) ) ? c3y : c3n;
{
u3_noun nam = u3dc("scot", 'p', u3k(u3A->our));
c3_c* nam_c = u3r_string(nam);
fprintf(stderr, "boot: ship: %s%s\r\n", nam_c,
(c3y == u3A->fak) ? " (fake)" : "");
free(nam_c);
u3z(nam);
}
}
u3_noun sac = u3_nul;
// intercept |mass, observe |reset
@ -434,10 +414,10 @@ _serf_sure(u3_noun ovo, u3_noun vir, u3_noun cor)
u3z(sac); u3z(ovo);
}
/* _serf_poke_live(): apply event.
/* _serf_work_live(): apply event.
*/
static void
_serf_poke_live(c3_d evt_d, // event number
_serf_work_live(c3_d evt_d, // event number
c3_l mug_l, // mug of state
u3_noun job) // event date
{
@ -543,10 +523,10 @@ _serf_boot_fire(u3_noun eve)
return pro;
}
/* _serf_poke_boot(): apply initial-stage event.
/* _serf_work_boot(): apply initial-stage event.
*/
static void
_serf_poke_boot(c3_d evt_d,
_serf_work_boot(c3_d evt_d,
c3_l mug_l,
u3_noun job)
{
@ -557,7 +537,7 @@ _serf_poke_boot(c3_d evt_d,
fprintf(stderr, "serf: (%" PRIu64 ")| boot\r\n", evt_d);
if ( 5 == evt_d ) {
if ( u3V.len_w == evt_d ) {
u3_noun eve, pru;
eve = u3kb_flop(u3A->roe);
@ -594,11 +574,11 @@ _serf_poke_work(c3_d evt_d, // event number
c3_l mug_l, // mug of state
u3_noun job) // full event
{
if ( evt_d < 6 ) {
_serf_poke_boot(evt_d, mug_l, job);
if ( evt_d <= u3V.len_w ) {
_serf_work_boot(evt_d, mug_l, job);
}
else {
_serf_poke_live(evt_d, mug_l, job);
_serf_work_live(evt_d, mug_l, job);
}
}
@ -610,6 +590,18 @@ _serf_poke_exit(c3_w cod_w) // exit code
exit(cod_w);
}
/* _serf_poke_boot(): prepare to boot.
*/
static void
_serf_poke_boot(u3_noun who, u3_noun fak, c3_w len_w)
{
c3_assert( u3_none == u3A->our );
u3A->our = who;
u3A->fak = fak;
u3V.len_w = len_w;
}
/* _serf_poke():
*/
void
@ -626,6 +618,29 @@ _serf_poke(void* vod_p, u3_noun mat)
goto error;
}
case c3__boot: {
u3_noun who, fak, len;
c3_w len_w;
if ( (c3n == u3r_qual(jar, 0, &who, &fak, &len)) ||
(c3n == u3ud(who)) ||
(1 < u3r_met(7, who)) ||
(c3n == u3ud(fak)) ||
(1 < u3r_met(0, fak)) ||
(c3n == u3ud(len)) ||
(1 < u3r_met(3, len)) )
{
goto error;
}
len_w = u3r_word(0, len);
u3k(who);
u3k(fak);
u3z(jar);
return _serf_poke_boot(who, fak, len_w);
}
case c3__work: {
u3_noun evt, mug, job;
c3_d evt_d;
@ -702,11 +717,15 @@ u3_serf_boot(void)
0, // XX u3r_mug(u3A->roc),
u3nc(u3k(u3A->our), u3k(u3A->fak))));
/* disable hashboard for fake ships
*/
// disable hashboard for fake ships
//
if ( c3y == u3A->fak ) {
u3C.wag_w |= u3o_hashless;
}
// no boot sequence expected
//
u3V.len_w = 0;
}
fprintf(stderr, "serf: play %" PRIu64 "\r\n", nex_d);