mall: refactor and rename

remove bones, give agent arms long names, remove metavase use, general
cleanup
This commit is contained in:
Philip Monk 2019-09-11 19:55:31 -07:00
parent abf4bc39cd
commit fbf56e3033
No known key found for this signature in database
GPG Key ID: B66E1F02604E44EC
8 changed files with 535 additions and 579 deletions

View File

@ -131,7 +131,10 @@
++ handle-init
`..handle-init
::
++ handle-prep
++ handle-extract-state
!>([%1 lac])
::
++ handle-upgrade-state
|= =old-state=vase
=/ old-state !<(hood-1 old-state-vase)
?~ old-state
@ -142,9 +145,9 @@
::
++ handle-poke
|= [=mark =vase]
^- (quip move:agent:mall agent:mall)
^- (quip card:agent:mall agent:mall)
=/ h (help hid)
=^ moves lac
=^ cards lac
?+ mark ~|([%poke-hood-bad-mark mark] !!)
%hood-load %- poke-hood-load:h
(need !<(hood-part vase))
@ -247,18 +250,18 @@
%write-wipe %- (wrap poke-wipe):from-write:h
(need !<(path vase))
==
[moves ..handle-init]
[cards ..handle-init]
::
++ handle-peer
++ handle-subscribe
|= =path
=/ h (help hid)
=^ moves lac
=^ cards lac
?+ path ~|([%hood-bad-path wire] !!)
[%drum *] ((wrap peer):from-drum:h t.path)
==
[moves ..handle-init]
[cards ..handle-init]
::
++ handle-pull
++ handle-unsubscribe
|= path
`..handle-init
::
@ -266,49 +269,46 @@
|= path
*(unit (unit cage))
::
++ handle-mall
++ handle-agent-response
|= [=wire =internal-gift:mall]
=/ h (help hid)
=^ moves lac
=^ cards lac
?+ wire ~|([%hood-bad-wire wire] !!)
[%helm %hi *] %+ (wrap coup-hi):from-helm:h t.t.wire
?>(?=(%coup -.internal-gift) p.internal-gift)
?>(?=(%poke-ack -.internal-gift) p.internal-gift)
[%kiln %fancy *] %+ (wrap take-coup-fancy):from-kiln:h t.t.wire
?>(?=(%coup -.internal-gift) p.internal-gift)
?>(?=(%poke-ack -.internal-gift) p.internal-gift)
[%kiln %reload *] %+ (wrap take-coup-reload):from-kiln:h t.t.wire
?>(?=(%coup -.internal-gift) p.internal-gift)
?>(?=(%poke-ack -.internal-gift) p.internal-gift)
[%kiln %spam *] %+ (wrap take-coup-spam):from-kiln:h t.t.wire
?>(?=(%coup -.internal-gift) p.internal-gift)
?>(?=(%poke-ack -.internal-gift) p.internal-gift)
[%drum %phat *]
?- -.internal-gift
%http-response !!
%coup ((wrap take-coup-phat):from-drum:h t.t.wire p.internal-gift)
%reap ((wrap reap-phat):from-drum:h t.t.wire p.internal-gift)
%quit ((wrap quit-phat):from-drum:h t.t.wire)
%diff
%poke-ack ((wrap take-coup-phat):from-drum:h t.t.wire p.internal-gift)
%subscription-ack ((wrap reap-phat):from-drum:h t.t.wire p.internal-gift)
%subscription-close ((wrap quit-phat):from-drum:h t.t.wire)
%subscription-update
%+ (wrap diff-sole-effect-phat):from-drum:h t.t.wire
?> ?=(%sole-effect p.p.internal-gift)
(need !<(sole-effect q.p.internal-gift))
==
==
[moves ..handle-init]
[cards ..handle-init]
::
++ handle-take
|= [=wire =vase]
++ handle-system-response
|= [=wire =sign-arvo]
=/ h (help hid)
=^ moves lac
=^ cards lac
?+ wire ~|([%hood-bad-wire wire] !!)
[%helm *] ((wrap take):from-helm:h t.wire vase)
[%drum *] ((wrap take):from-drum:h t.wire vase)
[%kiln *] ((wrap take-general):from-kiln:h t.wire vase)
[%write *] ((wrap take):from-write:h t.wire vase)
[%helm *] ((wrap take):from-helm:h t.wire sign-arvo)
[%drum *] ((wrap take):from-drum:h t.wire sign-arvo)
[%kiln *] ((wrap take-general):from-kiln:h t.wire sign-arvo)
[%write *] ((wrap take):from-write:h t.wire sign-arvo)
==
[moves ..handle-init]
[cards ..handle-init]
::
++ handle-lame
++ handle-error
|= [term tang]
`..handle-init
::
++ handle-stay
!>([%1 lac])
--

View File

@ -36,12 +36,12 @@
%quit
~| "unexpected subscription closure to {<dap.bowl>} on wire {<wire>}"
!!
::
::
%diff
~| "unexpected subscription update to {<dap.bowl>} on wire {<wire>}"
~| "with mark {<p.p.internal-gift>}"
!!
::
::
%http-response
~| "unexpected http-response to {<dap.bowl>} on wire {<wire>}"
!!

View File

@ -20,8 +20,7 @@
|:($:source +<(mir ((pair @ud (list @c))))) :: style-less mir
:: ::
++ pith-2 ::
$: sys/(unit bone) :: local console
eel/(set gill:gall) :: connect to
$: eel/(set gill:gall) :: connect to
ray/(set well:gall) ::
fur/(map dude:gall (unit server)) :: servers
bin/(map bone source) :: terminals
@ -121,7 +120,6 @@
^- part
:* %drum
%2
sys=~
eel=(deft-fish our)
ray=~
fur=~
@ -142,7 +140,8 @@
::::
::
|= {hid/bowl:gall part} :: main drum work
=+ (~(gut by bin) ost.hid *source)
=/ ost 0
=+ (~(gut by bin) ost *source)
=* dev -
=> |% :: arvo structures
++ pear :: request
@ -161,7 +160,7 @@
== ::
++ move (pair bone card) :: user-level move
--
|_ {moz/(list move:agent:mall) biz/(list dill-blit:dill)}
|_ {moz/(list card:agent:mall) biz/(list dill-blit:dill)}
++ diff-sole-effect-phat :: app event
|= {way/wire fec/sole-effect}
=< se-abet =< se-view
@ -227,9 +226,10 @@
(se-dump:(se-drop & gyl) u.saw)
::
++ take ::
|= [=wire =vase]
|= [=wire =sign-arvo]
%+ take-onto wire
+:(need !<([%onto (each suss:gall tang)] vase))
?> ?=(%onto +<.sign-arvo)
+>.sign-arvo
::
++ take-coup-phat :: ack poke
|= {way/wire saw/(unit tang)}
@ -239,7 +239,7 @@
?: (se-aint gyl) +>.$
%- se-dump:(se-drop & gyl)
:_ u.saw
>[%drum-coup-fail src.hid ost.hid gyl]<
>[%drum-coup-fail src.hid gyl]<
::
++ take-onto :: ack start
|= {way/wire saw/(each suss:gall tang)}
@ -258,27 +258,27 @@
|= way/wire
=< se-abet =< se-view
=+ gyl=(de-gill way)
~& [%drum-quit src.hid ost.hid gyl]
~& [%drum-quit src.hid gyl]
(se-drop %| gyl)
:: :: ::
:::: :: ::
:: :: ::
++ se-abet :: resolve
^- (quip move:agent:mall part)
^- (quip card:agent:mall part)
=* pith +<+.$
?. se-ably
=. . se-adit
[(flop moz) pith]
=. sys ?^(sys sys `ost.hid)
=. . se-subze:se-adze:se-adit
:_ pith(bin (~(put by bin) ost.hid dev))
:_ pith(bin (~(put by bin) ost dev))
%- flop
^- (list move:agent:mall)
^- (list card:agent:mall)
?~ biz moz
:_ moz
[ost.hid %give %diff %dill-blit !>(?~(t.biz i.biz [%mor (flop biz)]))]
=/ =blit:dill ?~(t.biz i.biz [%mor (flop biz)])
[%give %subscription-update `/drum %dill-blit !>(blit)]
::
++ se-ably (~(has by sup.hid) ost.hid) :: caused by console
++ se-ably (~(has by sup.hid) ost) :: caused by console
::
++ se-adit :: update servers
^+ .
@ -293,7 +293,7 @@
=. +>.$ (se-text "activated app {(trip p.wel)}/{(trip q.wel)}")
%- se-emit(fur (~(put by fur) q.wel ~))
=/ =wire [%drum p.wel q.wel ~]
[ost.hid %pass wire %meta %m !>([%conf [our.hid q.wel] our.hid p.wel])]
[%pass wire %arvo %m %conf [our.hid q.wel] our.hid p.wel]
::
++ se-adze :: update connections
^+ .
@ -306,14 +306,14 @@
(se-peer gil)
::
++ se-subze :: downdate connections
=< .(dev (~(got by bin) ost.hid))
=. bin (~(put by bin) ost.hid dev)
=< .(dev (~(got by bin) ost))
=. bin (~(put by bin) ost dev)
^+ .
%- ~(rep by bin)
=< .(con +>)
|: $:{{ost/bone dev/source} con/_.} ^+ con
=+ xeno=se-subze-local:%_(con ost.hid ost, dev dev)
xeno(ost.hid ost.hid.con, dev dev.con, bin (~(put by bin) ost dev.xeno))
=+ xeno=se-subze-local:%_(con ost ost, dev dev)
xeno(ost ost.con, dev dev.con, bin (~(put by bin) ost dev.xeno))
::
++ se-subze-local
^+ .
@ -328,7 +328,7 @@
++ se-aint :: ignore result
|= gyl/gill:gall
^- ?
?. (~(has by bin) ost.hid) &
?. (~(has by bin) ost) &
=+ gyr=(~(get by fug) gyl)
|(?=(~ gyr) ?=(~ u.gyr))
::
@ -436,8 +436,7 @@
::
++ se-blit-sys :: output to system
|= bil/dill-blit:dill ^+ +>
?~ sys ~&(%se-blit-no-sys +>)
(se-emit [u.sys %give %diff %dill-blit !>(bil)])
(se-emit %give %subscription-update %dill-blit `/drum !>(bil))
::
++ se-show :: show buffer, raw
|= lin/(pair @ud stub)
@ -475,7 +474,7 @@
(se-just ta-vew:(se-tame u.gul))
::
++ se-emit
|= move:agent:mall
|= card:agent:mall
%_(+> moz [+< moz])
::
++ se-hall
@ -497,16 +496,16 @@
::
++ se-poke :: send a poke
|= {gyl/gill:gall par/pear}
(se-emit [ost.hid %pass (en-gill gyl) %send p.gyl q.gyl %poke par])
(se-emit %pass (en-gill gyl) %agent p.gyl q.gyl %poke par)
::
++ se-peer :: send a peer
|= gyl/gill:gall
%- se-emit(fug (~(put by fug) gyl ~))
[ost.hid %pass (en-gill gyl) %send p.gyl q.gyl %peer /sole]
[%pass (en-gill gyl) %agent p.gyl q.gyl %subscribe /sole]
::
++ se-pull :: cancel subscription
|= gyl/gill:gall
(se-emit [ost.hid %pass (en-gill gyl) %send p.gyl q.gyl %pull ~])
(se-emit %pass (en-gill gyl) %agent p.gyl q.gyl %unsubscribe ~)
::
++ se-tame :: switch connection
|= gyl/gill:gall

View File

@ -34,19 +34,20 @@
:::: :: ::
:: :: ::
|: $:{bowl:gall part} :: main helm work
=+ sez=(~(gut by hoc) ost $:session)
=| moz=(list move:agent:mall)
=/ ost 0
=+ sez=(~(gut by hoc) $:session)
=| moz=(list card:agent:mall)
|%
++ abet
[(flop moz) %_(+<+.$ hoc (~(put by hoc) ost sez))]
[(flop moz) %_(+<+.$ hoc (~(put by hoc) sez))]
::
++ emit
|= (wind internal-note:mall internal-gift:mall)
%_(+> moz [[ost +<] moz])
|= card:agent:mall
%_(+> moz [+< moz])
::
++ flog
|= =flog:dill
(emit %pass /di %meta %d !>([%flog flog]))
(emit %pass /di %arvo %d %flog flog)
::
++ emil :: return cards
|= (list (wind internal-note:mall internal-gift:mall))
@ -66,18 +67,18 @@
?. =(our who.u.sed)
~& [%wrong-private-key-ship who.u.sed]
+>.$
(emit %pass / %meta %j !>([%rekey lyf.u.sed key.u.sed]))
(emit %pass / %arvo %j %rekey lyf.u.sed key.u.sed)
::
++ poke-moon :: rotate moon keys
|= sed=(unit [=ship =udiff:point:able:jael])
=< abet
?~ sed
+>.$
(emit %pass / %meta %j !>([%moon u.sed]))
(emit %pass / %arvo %j %moon u.sed)
::
++ poke-nuke :: initialize
|= him/ship =< abet
(emit %pass /helm %meta %j !>([%nuke him]))
(emit %pass /helm %arvo %j %nuke him)
::
++ poke-mass
|= ~ =< abet
@ -87,17 +88,17 @@
|= recur=@dr
=. mass-timer.sez
[/helm/automass (add now recur) recur]
abet:(emit %pass way.mass-timer.sez %meta %b !>([%wait nex.mass-timer.sez]))
abet:(emit %pass way.mass-timer.sez %arvo %b %wait nex.mass-timer.sez)
::
++ poke-cancel-automass
|= ~
abet:(emit %pass way.mass-timer.sez %meta %b !>([%rest nex.mass-timer.sez]))
abet:(emit %pass way.mass-timer.sez %arvo %b %rest nex.mass-timer.sez)
::
++ poke-bonk
|= ~
~& .^((unit @da) %a /(scot %p our)/time/(scot %da now)/(scot %p our))
%- %- slog :_ ~ .^(tank %b /(scot %p our)/timers/(scot %da now))
abet:(emit %pass /bonk %meta %a !>([%bonk ~]))
abet:(emit %pass /bonk %arvo %a %bonk ~)
::
++ take-wake-automass
|= [way=wire error=(unit tang)]
@ -108,15 +109,15 @@
=. nex.mass-timer.sez (add now tim.mass-timer.sez)
=< abet
%- emil
:~ [%pass /heft %meta %d !>([%flog %crud %hax-heft ~])]
[%pass way.mass-timer.sez %meta %b !>([%wait nex.mass-timer.sez])]
:~ [%pass /heft %arvo %d %flog %crud %hax-heft ~]
[%pass way.mass-timer.sez %arvo %b %wait nex.mass-timer.sez]
==
::
++ poke-send-hi
|= {her/ship mes/(unit tape)} =< abet
%- emit
:* %pass /helm/hi/(scot %p her)
%send her %hood %poke
%agent her %hood %poke
%helm-hi !>(?~(mes '' (crip u.mes)))
==
::
@ -163,7 +164,7 @@
=+ zus==('z' tip)
=+ way=?:(zus (welp top /sys/[nam]) (welp top /sys/vane/[nam]))
=+ fil=.^(@ %cx (welp way /hoon))
[%pass /reload %meta %d !>([%flog %veer ?:(=('z' tip) %$ tip) way fil])]
[%pass /reload %arvo %d %flog %veer ?:(=('z' tip) %$ tip) way fil]
:: +poke-reset: send %lyra to initiate kernel upgrade
::
:: And reinstall %zuse and the vanes with %veer.
@ -177,10 +178,10 @@
=/ top=path /(scot %p our)/home/(scot %da now)/sys
=/ hun .^(@ %cx (welp top /hoon/hoon))
=/ arv .^(@ %cx (welp top /arvo/hoon))
:- [%pass /reset %meta %d !>([%flog %lyra `@t`hun `@t`arv])]
:- [%pass /reset %arvo %d %flog %lyra `@t`hun `@t`arv]
%+ turn
(module-ova:pill top)
|=([=wire =flog:dill] [%pass wire %meta %d !>([%flog flog])])
|=([=wire =flog:dill] [%pass wire %arvo %d %flog flog])
::
++ poke-verb :: toggle verbose
|= ~ =< abet
@ -188,18 +189,18 @@
::
++ poke-serve
|= [=binding:eyre =generator:eyre] =< abet
(emit %pass /helm/serv %meta %e !>([%serve binding generator]))
(emit %pass /helm/serv %arvo %e %serve binding generator)
::
++ take-bound
|= [wir=wire success=? binding=binding:eyre] =< abet
(flog %text "bound: {<success>}")
::
++ take
|= [=wire =vase]
|= [=wire =sign-arvo]
?+ wire ~|([%helm-bad-take-wire wire] !!)
[%automass *] %+ take-wake-automass t.wire
+:(need !<([%wake (unit tang)] vase))
?>(?=(%wake +<.sign-arvo) +>.sign-arvo)
[%serv *] %+ take-bound t.wire
+:(need !<([%bound ? binding:eyre] vase))
?>(?=(%bound +<.sign-arvo) +>.sign-arvo)
==
--

View File

@ -13,7 +13,7 @@
++ part {$kiln $0 pith} :: kiln state
++ pith :: ::
$: rem/(map desk per-desk) ::
syn/(map kiln-sync {let/@ud ust/bone}) ::
syn/(map kiln-sync let/@ud) ::
autoload-on/? ::
cur-hoon/@uvI ::
cur-arvo/@uvI ::
@ -60,13 +60,13 @@
:: :: ::
|= {bowl:gall part} :: main kiln work
?> =(src our)
|_ moz/(list move:agent:mall)
|_ moz/(list card:agent:mall)
++ abet :: resolve
[(flop moz) `part`+<+.$]
::
++ emit
|= (wind internal-note:mall internal-gift:mall)
%_(+> moz [[ost +<] moz])
|= card:agent:mall
%_(+> moz [+< moz])
::
++ emil :: return cards
|= (list (wind internal-note:mall internal-gift:mall))
@ -81,17 +81,17 @@
++ poke-commit
|= [mon/kiln-commit auto=?]
=< abet
=. +>.$ (emit %pass /commit %meta %c !>([%dirk mon]))
=. +>.$ (emit %pass /commit %arvo %c [%dirk mon])
?. auto
+>.$
=/ recur ~s1
=. commit-timer
[/kiln/autocommit (add now recur) recur mon]
(emit %pass way.commit-timer %meta %b !>([%wait nex.commit-timer]))
(emit %pass way.commit-timer %arvo %b [%wait nex.commit-timer])
::
++ poke-cancel-autocommit
|= ~
abet:(emit %pass way.commit-timer %meta %b !>([%rest nex.commit-timer]))
abet:(emit %pass way.commit-timer %arvo %b [%rest nex.commit-timer])
::
++ poke-mount
|= kiln-mount
@ -99,7 +99,7 @@
?~ bem
=+ "can't mount bad path: {<pax>}"
abet:(spam leaf+- ~)
abet:(emit %pass /mount %meta %c !>([%mont pot u.bem]))
abet:(emit %pass /mount %arvo %c [%mont pot u.bem])
::
++ poke-unmount
|= mon/kiln-unmount
@ -108,8 +108,8 @@
?~ bem
=+ "can't unmount bad path: {<mon>}"
abet:(spam leaf+- ~)
abet:(emit %pass /unmount-beam %meta %c !>([%ogre [[p q r] s]:u.bem]))
abet:(emit %pass /unmount-point %meta %c !>([%ogre mon]))
abet:(emit %pass /unmount-beam %arvo %c [%ogre [[p q r] s]:u.bem])
abet:(emit %pass /unmount-point %arvo %c [%ogre mon])
::
++ poke-track ::
|= hos/kiln-sync
@ -145,13 +145,13 @@
::
++ poke-cancel
|= syd/desk
abet:(emit %pass /cancel %meta %c !>([%drop syd]))
abet:(emit %pass /cancel %arvo %c [%drop syd])
::
++ poke-info
|= {mez/tape tor/(unit toro)}
?~ tor
abet:(spam leaf+mez ~)
abet:(emit:(spam leaf+mez ~) %pass /kiln %meta %c !>([%info u.tor]))
abet:(emit:(spam leaf+mez ~) %pass /kiln %arvo %c [%info u.tor])
::
++ poke-rm
|= a/path
@ -178,7 +178,7 @@
=< abet
%- emit
=/ =rite [%r ~ ?:(pub %black %white) ~]
[%pass /kiln/permission %meta %c !>([%perm syd pax rite])]
[%pass /kiln/permission %arvo %c [%perm syd pax rite]]
::
++ poke-autoload |=(lod/(unit ?) abet:(poke:autoload lod))
++ poke-start-autoload |=(~ abet:start:autoload)
@ -220,7 +220,7 @@
::
++ subscribe-next
%- emit
[%pass /kiln/autoload %meta %c !>([%warp our %home `[%next %z da+now /sys]])]
[%pass /kiln/autoload %arvo %c [%warp our %home `[%next %z da+now /sys]]]
::
++ writ =>(check-new subscribe-next)
++ check-new
@ -232,14 +232,14 @@
=. cur-hoon new-hoon
=. cur-arvo new-arvo
=. cur-vanes rehash-vanes
(emit %pass /kiln/reload/hoon %send our %hood %poke %helm-reset !>(~))
(emit %pass /kiln/reload/hoon %agent our %hood %poke %helm-reset !>(~))
:: XX updates cur-vanes?
=/ new-zuse (sys-hash /zuse/hoon)
?: !=(new-zuse cur-zuse)
=. cur-zuse new-zuse
=. cur-vanes rehash-vanes
=/ =cage [%helm-reload !>([%zuse tracked-vanes])]
(emit [%pass /kiln/reload/zuse %send our %hood %poke cage])
(emit [%pass /kiln/reload/zuse %agent our %hood %poke cage])
(roll tracked-vanes load-vane)
::
++ load-vane
@ -251,7 +251,7 @@
+>.$
=. cur-vanes (~(put by cur-vanes) syd new-vane)
=/ =cage [%helm-reload !>(~[syd])]
(emit %pass /kiln/reload/[syd] %send our %hood %poke cage)
(emit %pass /kiln/reload/[syd] %agent our %hood %poke cage)
::
++ coup-reload
|= {way/wire saw/(unit tang)}
@ -263,17 +263,17 @@
:: +poke-overload: wipes ford cache at {start}, and then every {recur}.
|= [recur=@dr start=@da]
?> (gte start now)
abet:(emit %pass /kiln/overload/(scot %dr recur) %meta %c !>([%wait start]))
abet:(emit %pass /kiln/overload/(scot %dr recur) %arvo %c [%wait start])
::
++ poke-wipe-ford
|=(percent=@ud abet:(emit %pass /kiln %meta %c !>([%wipe percent])))
|=(percent=@ud abet:(emit %pass /kiln %arvo %c [%wipe percent]))
::
++ poke-keep-ford
|= [compiler-cache-size=@ud build-cache-size=@ud]
=< abet
(emit %pass /kiln %meta %c !>([%keep compiler-cache-size build-cache-size]))
(emit %pass /kiln %arvo %c [%keep compiler-cache-size build-cache-size])
::
++ poke-wash-gall |=(* abet:(emit %pass /kiln %meta %c !>([%wash ~])))
++ poke-wash-gall |=(* abet:(emit %pass /kiln %arvo %c [%wash ~]))
::
++ mack
|= {way/wire saw/(unit tang)}
@ -281,28 +281,28 @@
abet
::
++ take-general
|= [=wire =vase]
|= [=wire =sign-arvo]
?- wire
[%sync %merg *] %+ take-mere-sync t.t.wire
+:(need !<([%mere (each (set path) (pair term tang))] vase))
?>(?=(%mere +<.sign-arvo) +>.sign-arvo)
[%autoload *] %+ take-writ-autoload t.wire
+:(need !<([%writ riot] vase))
?>(?=(%writ +<.sign-arvo) +>.sign-arvo)
[%find-ship *] %+ take-writ-find-ship t.wire
+:(need !<([%writ riot] vase))
?>(?=(%writ +<.sign-arvo) +>.sign-arvo)
[%sync *] %+ take-writ-sync t.wire
+:(need !<([%writ riot] vase))
?>(?=(%writ +<.sign-arvo) +>.sign-arvo)
[%overload *] %+ take-wake-overload t.wire
+:(need !<([%wake (unit tang)] vase))
?>(?=(%wake +<.sign-arvo) +>.sign-arvo)
[%autocommit *] %+ take-wake-autocommit t.wire
+:(need !<([%wake (unit tang)] vase))
?>(?=(%wake +<.sign-arvo) +>.sign-arvo)
*
?+ -.q.vase ~|([%kiln-bad-take-card -.q.vase] !!)
?+ +<.sign-arvo ~|([%kiln-bad-take-card -.q.vase] !!)
%mack %+ mack wire
+:(need !<([%mack (unit tang)] vase))
?>(?=(%mack +<.sign-arvo) +>.sign-arvo)
%made %+ take-made wire
+:(need !<([%made @da made-result:ford] vase))
?>(?=(%made +<.sign-arvo) +>.sign-arvo)
%mere %+ take-mere wire
+:(need !<([%mere (each (set path) (pair term tang))] vase))
?>(?=(%mere +<.sign-arvo) +>.sign-arvo)
==
==
++ take |=(way/wire ?>(?=({@ ~} way) (work i.way))) :: general handler
@ -391,8 +391,8 @@
=. nex.commit-timer (add now tim.commit-timer)
=< abet
%- emil
:~ [%pass /commit %meta %c !>([%dirk mon.commit-timer])]
[%pass way.commit-timer %meta %b !>([%wait nex.commit-timer])]
:~ [%pass /commit %arvo %c [%dirk mon.commit-timer]]
[%pass way.commit-timer %arvo %b [%wait nex.commit-timer]]
==
::
::
@ -404,19 +404,19 @@
::
++ auto
|= kiln-sync
=+ (~(gut by syn) [syd her sud] [let=*@ud ust=ost])
=+ (~(gut by syn) [syd her sud] let=*@ud)
|%
++ abet
..auto(syn (~(put by syn) [syd her sud] let ust))
::
++ blab
|= new/(list move:agent:mall)
|= new/(list card:agent:mall)
^+ +>
+>.$(moz (welp new moz))
::
++ warp
|= [=bone =wire =ship =riff]
(blab [bone %pass wire %meta %c !>([%warp ship riff])] ~)
(blab [bone %pass wire %arvo %c [%warp ship riff]] ~)
::
++ spam |*(* %_(+> ..auto (^spam +<)))
++ stop
@ -429,18 +429,18 @@
=> (spam (render "activated track" sud her syd) ~)
=. let 1
=/ =wire /kiln/sync/[syd]/(scot %p her)/[sud]
(warp ost wire her sud `[%sing %y ud+let /])
(warp wire her sud `[%sing %y ud+let /])
::
++ start-sync
=> (spam (render "finding ship and desk" sud her syd) ~)
=/ =wire /kiln/find-ship/[syd]/(scot %p her)/[sud]
(warp ost wire her sud `[%sing %y ud+1 /])
(warp wire her sud `[%sing %y ud+1 /])
::
++ take-find-ship
|= rot=riot
=> (spam (render "activated sync" sud her syd) ~)
=/ =wire /kiln/sync/[syd]/(scot %p her)/[sud]
(warp ost wire her sud `[%sing %w [%da now] /])
(warp wire her sud `[%sing %w [%da now] /])
::
++ writ
|= rot=riot
@ -475,7 +475,7 @@
=< %- spam
?: =(our her) ~
[(render "beginning sync" sud her syd) ~]
(blab [ost %pass wire %meta %c !>([%merg syd her sud ud+let germ])] ~)
(blab [%pass wire %arvo %c [%merg syd her sud ud+let germ]] ~)
::
++ mere
|= mes=(each (set path) (pair term tang))
@ -506,7 +506,7 @@
==
==
=/ =wire /kiln/sync/[syd]/(scot %p her)/[sud]
(warp ost wire her sud `[%sing %y ud+let /])
(warp wire her sud `[%sing %y ud+let /])
--
::
++ work :: state machine
@ -520,7 +520,7 @@
..work(rem (~(put by rem) syd auto gem her sud cas))
::
++ blab
|= new/(list move:agent:mall)
|= new/(list card:agent:mall)
^+ +>
+>.$(moz (welp new moz))
::
@ -541,14 +541,14 @@
::
++ perform ::
^+ .
(blab [ost %pass /kiln/[syd] %meta %c !>([%merg syd her sud cas gem])] ~)
(blab [%pass /kiln/[syd] %arvo %c [%merg syd her sud cas gem]] ~)
::
++ fancy-merge :: send to self
|= {syd/desk her/@p sud/desk gem/?($auto germ)}
^+ +>
=/ =cage [%kiln-merge !>([syd her sud cas gem])]
%- blab :_ ~
[ost %pass /kiln/fancy/[^syd] %send our %hood %poke cage]
[%pass /kiln/fancy/[^syd] %agent our %hood %poke cage]
::
++ spam ::|=(tang ((slog +<) ..spam))
|*(* +>(..work (^spam +<)))
@ -568,8 +568,8 @@
?~ saw
=> (spam leaf+"%melding %{(trip sud)} into scratch space" ~)
%- blab :_ ~
=/ =vase !>([%merg (cat 3 syd '-scratch') her sud cas gem])
[ost %pass /kiln/[syd] %meta %c vase]
=/ note [%merg (cat 3 syd '-scratch') her sud cas gem]
[%pass /kiln/[syd] %arvo %c note]
=+ :- "failed to set up conflict resolution scratch space"
"I'm out of ideas"
lose:(spam leaf+-< leaf+-> u.saw)
@ -588,7 +588,7 @@
=+ tic=(cat 3 syd '-scratch')
%- blab :_ ~
=, ford
:* ost %pass /kiln/[syd] %meta %f !>
:* %pass /kiln/[syd] %arvo %f
:* %build live=%.n
^- schematic
:- %list
@ -718,7 +718,7 @@
=< win
%- blab:(spam tan)
:_ ~
:* ost %pass /kiln/[syd] %meta %c !>
:* %pass /kiln/[syd] %arvo %c
:* %info
(cat 3 syd '-scratch') %&
%+ murn can

View File

@ -21,11 +21,11 @@
::
|= {bowl:gall part}
=* par +<+
|_ moz/(list move:agent:mall)
|_ moz/(list card:agent:mall)
++ abet [(flop moz) `part`par]
++ emit
|= a/(wind internal-note:mall internal-gift:mall)
%_(+> moz :_(moz [ost a]))
|= =card:agent:mall
%_(+> moz :_(moz card))
::
++ beak-now byk(r [%da now])
++ poke-wipe
@ -33,7 +33,7 @@
=+ ext=%md
?~ (file (en-beam beak-now [ext sup]))
~|(not-found+[ext `path`(flop sup)] !!)
=- abet:(emit %pass /write %meta %c !>([%info -]))
=- abet:(emit %pass /write %arvo %c %info -)
(fray (en-beam beak-now [ext sup]))
::
++ poke-tree
@ -94,13 +94,13 @@
(made pax now [%complete %success %$ cay])
=< abet
%- emit :*
%pass write+pax %meta %f !>
:* %build
%pass write+pax %arvo %f
%build
live=%.n :: XX defer %nice
^- schematic:ford :: SYNTAX ERROR AT START OF LINE?
=/ =beak beak-now
[%cast [p q]:beak u.ext [%$ cay]]
== ==
==
::
++ made
|= [pax=wire date=@da result=made-result:ford]
@ -118,12 +118,13 @@
::
=/ =cage (result-to-cage:ford build-result)
::
=- abet:(emit %pass /write %meta %c !>([%info -]))
=- abet:(emit %pass /write %arvo %c %info -)
::
(foal :(welp (en-beam beak-now ~) pax /[-.cage]) cage)
::
++ take ::
|= [=wire =vase]
|= [=wire =sign-arvo]
%+ made wire
+:(need !<([%made @da made-result:ford] vase))
?> ?=(%made +<.sign-arvo)
+>.sign-arvo
--

File diff suppressed because it is too large Load Diff

View File

@ -1870,17 +1870,17 @@
$% {$conf p/dock q/dock} :: configure app
{$conf-mall p/dock q/dock} :: configure app
$>(%init vane-task) :: set owner
{$deal p/sock q/internal-task} :: full transmission
{$deal-mall p/sock q/internal-task} :: full transmission
{$deal p/sock q/term r/task:agent} :: full transmission
{$deal-mall p/sock q/term r/task:agent} :: full transmission
$>(%vega vane-task) :: report upgrade
$>(%west vane-task) :: network request
[%wash ~] :: clear caches
$>(%wegh vane-task) :: report memory
== ::
-- ::able
++ bitt (map bone (pair ship path)) :: incoming subs
++ bitt (map duct (pair ship path)) :: incoming subs
++ boat :: outgoing subs
%+ map (pair bone wire) ::
%+ map wire ::
(trel bean ship path) ::
++ bowl :: standard app state
$: $: our/ship :: host
@ -1890,23 +1890,11 @@
$: wex/boat :: outgoing subs
sup/bitt :: incoming subs
== ::
$: ost/bone :: opaque cause
act/@ud :: change number
$: act/@ud :: change number
eny/@uvJ :: entropy
now/@da :: current time
byk/beak :: load source
== == ::
++ agent-action :: agent action
$% {$peel p/mark q/path} :: translated peer
{$peer p/path} :: subscribe
{$poke p/cage} :: apply
{$puff p/mark q/noun} :: unchecked poke
{$pull ~} :: unsubscribe
{$punk p/mark q/cage} :: translated poke
{$pump ~} :: pump yes+no
{$peer-not p/tang} :: poison pill peer
== ::
++ internal-task task:agent :: internal task
++ dude term :: server identity
++ gill (pair ship term) :: general contact
++ scar :: opaque duct
@ -1916,7 +1904,6 @@
== ::
++ suss (trel dude @tas @da) :: config report
++ well (pair desk term) ::
::
:: +agent: app core
::
++ agent
@ -1924,8 +1911,8 @@
|%
+$ step (quip card form)
+$ card (wind note gift)
+$ note
$% [%arvo note-arvo]
+$ note
$% [%arvo =note-arvo]
[%agent =ship name=term =task]
==
+$ task
@ -1939,8 +1926,8 @@
==
+$ gift
$% [%poke-ack p=(unit tang)]
[%subscription-update p=cage]
[%subscription-closed ~]
[%subscription-update path=(unit path) =cage]
[%subscription-close path=(unit path)]
[%subscription-ack p=(unit tang)]
[%http-response =http-event:http]
==
@ -1948,42 +1935,42 @@
$_ ^|
|_ bowl
++ handle-init
*(quip move _^|(..handle-init))
*(quip card _^|(..handle-init))
::
++ handle-extract-state
*vase
::
++ handle-upgrade-state
|~ old-state=vase
*(quip move _^|(..handle-init))
*(quip card _^|(..handle-init))
::
++ handle-poke
|~ in-poke-data=cage
*(quip move _^|(..handle-init))
*(quip card _^|(..handle-init))
::
++ handle-subscribe
|~ path
*(quip move _^|(..handle-init))
*(quip card _^|(..handle-init))
::
++ handle-unsubscribe
|~ path
*(quip move _^|(..handle-init))
*(quip card _^|(..handle-init))
::
++ handle-peek
|~ path
*(unit (unit cage))
::
++ handle-agent-response
|~ [wire internal-gift]
*(quip move _^|(..handle-init))
|~ [wire gift]
*(quip card _^|(..handle-init))
::
++ handle-arvo-response
|~ [wire =sign-arvo]
*(quip move _^|(..handle-init))
*(quip card _^|(..handle-init))
::
++ handle-error
|~ [term tang]
*(quip move _^|(..handle-init))
*(quip card _^|(..handle-init))
--
--
-- ::mall
@ -2442,6 +2429,116 @@
{$ix p/@da q/@ud r/@if} :: IPv4 provisional
== ::
-- ::xmas
++ gift-arvo :: out result <-$
$~ [%init ~zod]
$% gift:able:ames
gift:able:behn
gift:able:clay
gift:able:dill
gift:able:eyre
gift:able:ford
gift:able:gall
gift:able:mall
gift:able:iris
gift:able:jael
==
++ task-arvo :: in request ->$
$% task:able:ames
task:able:clay
task:able:behn
task:able:dill
task:able:iris
task:able:ford
task:able:gall
task:able:eyre
task:able:jael
==
++ note-arvo :: out request $->
$~ [%a %wake ~]
$% {$a task:able:ames}
{$b task:able:behn}
{$c task:able:clay}
{$d task:able:dill}
[%e task:able:eyre]
{$f task:able:ford}
{$g task:able:gall}
{$m task:able:mall}
[%i task:able:iris]
{$j task:able:jael}
{@tas $meta vase}
==
++ sign-arvo :: in result $<-
$% {$a gift:able:ames}
$: $b
$% gift:able:behn
[%writ riot:clay]
$>(%mere gift:able:clay)
==
==
{$c gift:able:clay}
{$d gift:able:dill}
{$f gift:able:ford}
[%e gift:able:eyre]
{$g gift:able:gall}
{$m gift:able:mall}
[%i gift:able:iris]
{$j gift:able:jael}
==
::
+$ unix-task :: input from unix
$~ [%wake ~]
$% :: %ames: new process
::
$>(%barn task:able:ames)
:: %dill: keyboard input
::
$>(%belt task:able:dill)
:: %dill: configure terminal (resized)
::
$>(%blew task:able:dill)
:: %clay: new process
::
$>(%boat task:able:clay)
:: %behn/%eyre/%iris: new process
::
$>(%born vane-task)
:: %eyre: cancel request
::
[%cancel-request ~]
:: any vane: error report
::
$>(%crud vane-task)
:: %dill: reset terminal configuration
::
$>(%hail task:able:dill)
:: %ames: hear packet
::
$>(%hear task:able:ames)
:: %dill: hangup
::
$>(%hook task:able:dill)
:: %clay: external edit
::
$>(%into task:able:clay)
:: %eyre: learn ports of live http servers
::
$>(%live task:able:eyre)
:: %iris: hear (partial) http response
::
$>(%receive task:able:iris)
:: %eyre: starts handling an inbound http request
::
$>(%request task:able:eyre)
:: %eyre: starts handling an backdoor http request
::
$>(%request-local task:able:eyre)
:: %behn: wakeup
::
$>(%wake task:able:behn)
:: %ames: send message
::
$>(%want task:able:ames)
==
-- ::
:: :: ::
:::: :: :: (2) engines
@ -7540,115 +7637,6 @@
--
::
++ zuse %309 :: hoon+zuse kelvin
++ gift-arvo :: out result <-$
$~ [%init ~zod]
$% gift:able:ames
gift:able:behn
gift:able:clay
gift:able:dill
gift:able:eyre
gift:able:ford
gift:able:gall
gift:able:iris
gift:able:jael
==
++ task-arvo :: in request ->$
$% task:able:ames
task:able:clay
task:able:behn
task:able:dill
task:able:iris
task:able:ford
task:able:gall
task:able:eyre
task:able:jael
==
++ note-arvo :: out request $->
$~ [%a %wake ~]
$% {$a task:able:ames}
{$b task:able:behn}
{$c task:able:clay}
{$d task:able:dill}
[%e task:able:eyre]
{$f task:able:ford}
{$g task:able:gall}
{$m task:able:mall}
[%i task:able:iris]
{$j task:able:jael}
{@tas $meta vase}
==
++ sign-arvo :: in result $<-
$% {$a gift:able:ames}
$: $b
$% gift:able:behn
[%writ riot:clay]
$>(%mere gift:able:clay)
==
==
{$c gift:able:clay}
{$d gift:able:dill}
{$f gift:able:ford}
[%e gift:able:eyre]
{$g gift:able:gall}
{$m gift:able:mall}
[%i gift:able:iris]
{$j gift:able:jael}
==
::
+$ unix-task :: input from unix
$~ [%wake ~]
$% :: %ames: new process
::
$>(%barn task:able:ames)
:: %dill: keyboard input
::
$>(%belt task:able:dill)
:: %dill: configure terminal (resized)
::
$>(%blew task:able:dill)
:: %clay: new process
::
$>(%boat task:able:clay)
:: %behn/%eyre/%iris: new process
::
$>(%born vane-task)
:: %eyre: cancel request
::
[%cancel-request ~]
:: any vane: error report
::
$>(%crud vane-task)
:: %dill: reset terminal configuration
::
$>(%hail task:able:dill)
:: %ames: hear packet
::
$>(%hear task:able:ames)
:: %dill: hangup
::
$>(%hook task:able:dill)
:: %clay: external edit
::
$>(%into task:able:clay)
:: %eyre: learn ports of live http servers
::
$>(%live task:able:eyre)
:: %iris: hear (partial) http response
::
$>(%receive task:able:iris)
:: %eyre: starts handling an inbound http request
::
$>(%request task:able:eyre)
:: %eyre: starts handling an backdoor http request
::
$>(%request-local task:able:eyre)
:: %behn: wakeup
::
$>(%wake task:able:behn)
:: %ames: send message
::
$>(%want task:able:ames)
==
:: ::
:::: ++azimuth :: (2az) azimuth
:: ::::