From 31fe240632f608dddd7bbb4c4807fbf89b0ee47b Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Wed, 9 Sep 2020 22:50:43 -0700 Subject: [PATCH] arvo: adds |meld, triggering memory unification --- pkg/arvo/gen/hood/meld.hoon | 13 +++++++++++++ pkg/arvo/lib/hood/helm.hoon | 5 +++++ pkg/arvo/sys/vane/dill.hoon | 1 + pkg/arvo/sys/zuse.hoon | 3 +++ 4 files changed, 22 insertions(+) create mode 100644 pkg/arvo/gen/hood/meld.hoon diff --git a/pkg/arvo/gen/hood/meld.hoon b/pkg/arvo/gen/hood/meld.hoon new file mode 100644 index 000000000..f436c7447 --- /dev/null +++ b/pkg/arvo/gen/hood/meld.hoon @@ -0,0 +1,13 @@ +:: Helm: unify memory +:: +:::: /hoon/meld/hood/gen + :: +/? 310 +:: +:::: + :: +:- %say +|= $: [now=@da eny=@uvJ bec=beak] + [arg=~ ~] + == +[%helm-meld ~] diff --git a/pkg/arvo/lib/hood/helm.hoon b/pkg/arvo/lib/hood/helm.hoon index 007e8c0e4..1f318fd76 100644 --- a/pkg/arvo/lib/hood/helm.hoon +++ b/pkg/arvo/lib/hood/helm.hoon @@ -100,6 +100,10 @@ |= ~ abet:(emit %pass way.mass-timer.sat %arvo %b %rest nex.mass-timer.sat) :: +++ poke-meld + |= ~ =< abet + (emit %pass /pack %arvo %d %flog %meld ~) +:: ++ poke-pack |= ~ =< abet (emit %pass /pack %arvo %d %flog %pack ~) @@ -228,6 +232,7 @@ %helm-hi =;(f (f !<(_+<.f vase)) poke-hi) %helm-knob =;(f (f !<(_+<.f vase)) poke-knob) %helm-mass =;(f (f !<(_+<.f vase)) poke-mass) + %helm-meld =;(f (f !<(_+<.f vase)) poke-meld) %helm-moon =;(f (f !<(_+<.f vase)) poke-moon) %helm-pack =;(f (f !<(_+<.f vase)) poke-pack) %helm-rekey =;(f (f !<(_+<.f vase)) poke-rekey) diff --git a/pkg/arvo/sys/vane/dill.hoon b/pkg/arvo/sys/vane/dill.hoon index 373e4e0c5..04f4d0353 100644 --- a/pkg/arvo/sys/vane/dill.hoon +++ b/pkg/arvo/sys/vane/dill.hoon @@ -117,6 +117,7 @@ $blew (send %rez p.p.kyz q.p.kyz) $heft (dump %whey ~) $lyra (dump kyz) + $meld (dump kyz) $pack (dump kyz) $crop (dump trim+p.kyz) $veer (dump kyz) diff --git a/pkg/arvo/sys/zuse.hoon b/pkg/arvo/sys/zuse.hoon index e57fc5d77..e37251659 100644 --- a/pkg/arvo/sys/zuse.hoon +++ b/pkg/arvo/sys/zuse.hoon @@ -1110,6 +1110,7 @@ {$init p/@p} :: set owner {$logo ~} :: logout [%lyra hoon=(unit @t) arvo=@t] :: upgrade kernel + {$meld ~} :: unify memory {$pack ~} :: compact memory {$trim p/@ud} :: trim kernel state {$veer p/@ta q/path r/@t} :: install vane @@ -1131,6 +1132,7 @@ {$harm ~} :: all terms hung up $>(%init vane-task) :: after gall ready [%lyra hoon=(unit @t) arvo=@t] :: upgrade kernel + {$meld ~} :: unify memory {$noop ~} :: no operation {$pack ~} :: compact memory {$talk p/tank} :: @@ -1198,6 +1200,7 @@ {$crud p/@tas q/(list tank)} :: {$heft ~} :: [%lyra hoon=(unit @t) arvo=@t] :: upgrade kernel + {$meld ~} :: unify memory {$pack ~} :: compact memory {$text p/tape} :: {$veer p/@ta q/path r/@t} :: install vane