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

hood,desk.bill: fix boot issues

Browse Source
This commit is contained in:
Ted Blackman 2021-07-23 14:07:58 +03:00
parent d9c9740b8d
commit 2507404f97
4 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/arvo/desk.bill
View File

@ -11,5 +11,6 @@
==
:- %fish
:~ %dojo
%hood
==
==

1
pkg/arvo/lib/hood/drum.hoon
View File

@ -435,6 +435,7 @@
::
++ se-peer :: send a peer
|= gyl=gill:gall
~> %slog.0^leaf/"drum: link {<[p q]:gyl>}"
=/ =path /sole/(cat 3 'drum_' (scot %p our.hid))
%- se-emit(fug (~(put by fug) gyl ~))
[%pass (en-gill gyl) %agent gyl %watch path]

48
pkg/arvo/lib/hood/kiln.hoon
View File

@ -1,4 +1,5 @@
/- *hood
/* base-bill %bill /desk/bill
=, clay
=, space:userlib
=, format
@ -107,11 +108,11 @@
++ on-init
=< abet
~> %slog.0^leaf/"kiln: boot"
=/ =rein [add=(sy %hood %dojo ~) sub=~]
=/ daz (get-apps-want base-bill rein)
%- emil
%+ turn (get-apps-want our now %base *rein)
|= =dude
~> %slog.0^leaf/"kiln: %jolt {<dude>}"
[%pass /kiln/vats/base/jolt/[dude] %arvo %g %jolt %base dude]
%- zing ^- (list (list card:agent:gall))
(turn daz start-dude:~(pass vats [%base *arak]))
::
++ on-load
|= [hood-version=@ud old=any-state]
@ -177,7 +178,7 @@
[%x %kiln %ark ~] ``noun+!>(ark)
[%x %kiln %our ~] ``noun+!>(our)
[%x %kiln %base-hash ~]
=/ ver (mergebase-hashes our now %base (~(got by ark) %base))
=/ ver (mergebase-hashes our %base now (~(got by ark) %base))
``noun+!>(?~(ver 0v0 i.ver))
==
::
@ -223,16 +224,20 @@
|= =dude
^- (list card:agent:gall)
:- [%pass /kiln/vats/[loc]/jolt/[dude] %arvo %g %jolt loc dude]
?. (is-fish our now loc dude)
?. (is-fish dude (read-bill our loc now))
~> %slog.0^leaf/"kiln: jolt {<dude>}"
~
~> %slog.0^leaf/"kiln: jolt {<dude>}, binding console"
=/ =cage [%drum-link !>([our dude])]
[%pass /kiln/link/[dude] %agent [our %hood] %poke cage]~
++ stop-dude
|= =dude
^- (list card:agent:gall)
:- [%pass /kiln/vats/[loc]/uninstall %arvo %g %idle dude]
?. (is-fish our now loc dude)
?. (is-fish dude (read-bill our loc now))
~> %slog.0^leaf/"kiln: idle {<dude>}"
~
~> %slog.0^leaf/"kiln: idle {<dude>}, unbinding console"
=/ =cage [%drum-unlink !>([our dude])]
[%pass /kiln/link/[dude] %agent [our %hood] %poke cage]~
--
@ -246,7 +251,11 @@
kiln
=. vats (abed lac)
~> %slog.0^leaf/"kiln: uninstalling {here}"
=. vats (update-running-apps liv=~ ded=(get-apps-live our now lac))
=/ ded (get-apps-live our lac now)
:: hood and dojo must never die
::
=. ded (skip ded |=(d=dude ?=(?(%hood %base) d)))
=. vats (stop-dudes ded)
kiln(ark (~(del by ark) lac))
:: +install: set up desk sync to .lac to install all apps from [her rem]
::
@ -381,7 +390,7 @@
vats
=. vats
~> %slog.0^leaf/"kiln: merge into {here} succeeded"
(update-running-apps (get-apps-diff our now loc rein.rak))
(update-running-apps (get-apps-diff our loc now rein.rak))
?. =(%base loc)
vats
=. kiln (bump (sy %base %kids ~))
@ -417,13 +426,18 @@
::
++ update-running-apps
|= [liv=(list dude) ded=(list dude)]
^+ vats
~> %slog.0^leaf/"kiln: starting {<liv>}"
~> %slog.0^leaf/"kiln: stopping {<ded>}"
%- emil
%+ weld
`(list card:agent:gall)`(zing (turn liv start-dude:pass))
`(list card:agent:gall)`(zing (turn ded stop-dude:pass))
=. vats (start-dudes liv)
=. vats (stop-dudes ded)
vats
::
++ start-dudes
|= daz=(list dude)
(emil `(list card:agent:gall)`(zing (turn daz start-dude:pass)))
::
++ stop-dudes
|= daz=(list dude)
~> %slog.0^leaf/"kiln: stopping {<daz>}"
(emil `(list card:agent:gall)`(zing (turn daz stop-dude:pass)))
--
:: +get-ankh: extract $ankh from clay %v response $rant
::
@ -560,7 +574,7 @@
?. desk
(emit %pass /nuke %arvo %g [%nuke term])
%- emil
%+ turn (get-apps-have our now term)
%+ turn (get-apps-have our term now)
|=([=dude ?] [%pass /nuke %arvo %g [%nuke dude]])
::
++ poke-permission

31
pkg/arvo/sur/hood.hoon
View File

@ -44,7 +44,7 @@
=- ?: =(~ next.arak) -
(snoc - leaf/"pending: {<next.arak>}")
^- tang
=/ meb (mergebase-hashes our now desk arak)
=/ meb (mergebase-hashes our desk now arak)
=/ len (lent meb)
:~ leaf/"/sys/kelvin: {<[lal num]:weft>}"
leaf/"base hash: {?:((gth len 1) <meb> <(head meb)>)}"
@ -81,49 +81,50 @@
%direct q.q.bob
%delta q.r.bob
==
:: +read-bill: read contents of /desk/bill manifest
::
++ read-bill
|= [our=ship =desk now=@da]
.^(bill cx+/(scot %p our)/[desk]/(scot %da now)/desk/bill)
:: +is-fish: should dill link .dude?
::
++ is-fish
|= [our=ship now=@da =desk =dude]
^- ?
=+ .^(=bill cx+/(scot %p our)/[desk]/(scot %da now)/desk/bill)
.?((find ~[dude] (read-fish bill)))
++ is-fish |=([=dude =bill] .?((find ~[dude] (read-fish bill))))
:: +get-apps-diff: which agents should be started and stopped
::
++ get-apps-diff
|= [our=ship now=@da =desk =rein]
|= [our=ship =desk now=@da =rein]
^- [liv=(list dude) ded=(list dude)]
=/ wan (sy (get-apps-want our now desk rein))
=/ hav (sy (get-apps-live our now desk))
=/ =bill (read-bill our desk now)
=/ wan (sy (get-apps-want bill rein))
=/ hav (sy (get-apps-live our desk now))
=/ liv ~(tap in (~(dif in wan) hav))
=/ ded ~(tap in (~(dif in hav) wan))
[liv ded]
::
++ get-apps-live
|= [our=ship now=@da =desk]
|= [our=ship =desk now=@da]
^- (list dude)
%+ murn (get-apps-have our now desk)
%+ murn (get-apps-have our desk now)
|=([=dude live=?] ?.(live ~ `dude))
:: +get-apps-have: find which apps Gall is running on a desk
::
++ get-apps-have
|= [our=ship now=@da =desk]
|= [our=ship =desk now=@da]
^- (list [=dude live=?])
%~ tap in
.^((set [=dude live=?]) ge+/(scot %p our)/[desk]/(scot %da now))
:: +get-apps-want: find which apps should be running on a desk
::
++ get-apps-want
|= [our=ship now=@da =desk =rein]
|= [=bill =rein]
^- (list dude)
=+ .^(=bill cx+/(scot %p our)/[desk]/(scot %da now)/desk/bill)
=/ duz (read-apes bill)
=. duz (skip duz ~(has in sub.rein))
=. duz (weld duz ~(tap in add.rein))
duz
::
++ mergebase-hashes
|= [our=@p now=@da =desk =arak]
|= [our=@p =desk now=@da =arak]
=/ her (scot %p ship.arak)
=/ ego (scot %p our)
=/ wen (scot %da now)