ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-30 19:11:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

clay: finalize fuse request - update |fuse

Browse Source
This commit is contained in:
raghu 2021-04-24 20:50:50 -04:00
parent 9d7afd10ee
commit 201c3db193
4 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/arvo/gen/hood/fuse.hoon
View File

@ -8,5 +8,5 @@
::::
::
:- %say
|= [[now=@da eny=@uvJ bec=beak] [des=desk srcs=(list [beak germ]) ~] ~]
[%kiln-fuse des srcs]
|= [[now=@da eny=@uvJ bec=beak] [des=desk bas=beak con=(list [beak germ]) ~] ~]
[%kiln-fuse des bas con]

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

@ -57,7 +57,8 @@
==
+$ kiln-fuse
$: syd=desk
srcs=(list [beak germ])
bas=beak
con=(list [beak germ])
==
--
|= [bowl:gall state]
@ -387,7 +388,7 @@
::
++ poke-fuse
|= k=kiln-fuse
abet:(emit [%pass /kiln/fuse/[syd.k] %arvo %c [%fuse syd.k srcs.k]])
abet:(emit [%pass /kiln/fuse/[syd.k] %arvo %c [%fuse syd.k bas.k con.k]])
::
++ poke-cancel
|= a=@tas

4
pkg/arvo/sys/lull.hoon
View File

@ -764,8 +764,8 @@
== ::
$: %fuse :: mega merge
des=desk :: target desk
ful=(list beak) :: source desks
gim=(list germ) :: strategies
bas=beak :: base desk
con=(list [beak germ]) :: merges
==
[%mont pot=term bem=beam] :: mount to unix
[%dirk des=desk] :: mark mount dirty

30
pkg/arvo/sys/vane/clay.hoon
View File

@ -1976,43 +1976,29 @@
(turn con |=(a=[beak germ] [-.a *(unit dome:clay)]))
::
++ start-fuse
|= [ful=(list beak) gim=(list germ)]
|= [bas=beak con=(list [beak germ])]
^+ ..start-fuse
:: must have n sources and n-1 gems
?> =((lent ful) +((lent gim)))
=/ moves=(list move)
%+ turn
ful
|= bec=beak
[[bas *germ] con]
|= [bec=beak germ]
^- move
=/ wir=wire /fuse/[syd]/(scot %p p.bec)/[q.bec]/(scot r.bec)
[hen %pass wir %c %warp p.bec q.bec `[%sing %v r.bec /]]
?~ ful
!!
=/ base=beak i.ful
=/ ful=(list beak) t.ful
=/ con=(list [beak germ])
=| acc=(list [beak germ])
|-
?~ ful
acc
?~ gim
!!
$(acc [[i.ful i.gim] acc], ful t.ful, gim t.gim)
:: we also want to clear the state (fiz) associated with this
:: merge and print a warning if it's non trivial i.e. we're
:: starting a new fuse before the previous one terminated.
~& ?~ con.fiz
[%starting-fuse base con]
[%starting-fuse bas con]
:* %starting-fuse
base
bas
con
%discarding-state
:: we don't want to ~& an entire dome
%- ~(run by sto.fiz)
|=(v=(unit dome:clay) ?~(v %not-received %recieved))
==
=. fiz (make-melt base con)
=. fiz (make-melt bas con)
(emil moves)
::
++ take-fuse
@ -4238,7 +4224,7 @@
~&(%fuse-no-desk !!)
=^ mos ruf
=/ den ((de now rof hen ruf) our des.req)
abet:(start-fuse:den ful.req gim.req)
abet:(start-fuse:den bas.req con.req)
[mos ..^$]
::
%mont
@ -4570,7 +4556,7 @@
abet:(merge:den ali-ship ali-desk germ p.hin)
[mos ..^$]
::
?: ?=([%fuse @ @ @ @ @ ~] tea)
?: ?=([%fuse @ @ @ @ ~] tea)
?> ?=(%writ +<.hin)
=* syd i.t.tea
=/ ali-ship=@p (slav %p i.t.t.tea)