mirror of
https://github.com/urbit/shrub.git
synced 2024-11-28 13:54:20 +03:00
Merge branch 'harden-vanes' (#2189)
* origin/harden-vanes: /sys: use +harden on vane tasks Signed-off-by: Jared Tobin <jared@tlon.io>
This commit is contained in:
commit
275e23df63
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:e6232e5bcb64be057ccd9b4c23bbd636814d50778e4f3a01fbf2ee0042fe3d44
|
oid sha256:cc80ac4de50bb5be47c6545289d883ad7e334f19464fb61a91fe96a5dcbfd4be
|
||||||
size 9635072
|
size 9633328
|
||||||
|
@ -918,11 +918,7 @@
|
|||||||
++ call
|
++ call
|
||||||
|= [=duct type=* wrapped-task=(hobo task)]
|
|= [=duct type=* wrapped-task=(hobo task)]
|
||||||
::
|
::
|
||||||
=/ =task
|
=/ =task ((harden task) wrapped-task)
|
||||||
?. ?=(%soft -.wrapped-task)
|
|
||||||
wrapped-task
|
|
||||||
~| our^%ames-fail-soft
|
|
||||||
;;(task p.wrapped-task)
|
|
||||||
:: %born: set .unix-duct and start draining .queued-events
|
:: %born: set .unix-duct and start draining .queued-events
|
||||||
::
|
::
|
||||||
?: ?=(%born -.task)
|
?: ?=(%born -.task)
|
||||||
@ -1056,11 +1052,7 @@
|
|||||||
|= [=duct type=* wrapped-task=(hobo task)]
|
|= [=duct type=* wrapped-task=(hobo task)]
|
||||||
^- [(list move) _ames-gate]
|
^- [(list move) _ames-gate]
|
||||||
::
|
::
|
||||||
=/ =task
|
=/ =task ((harden task) wrapped-task)
|
||||||
?. ?=(%soft -.wrapped-task)
|
|
||||||
wrapped-task
|
|
||||||
~| %ames-bad-task^p.wrapped-task
|
|
||||||
;;(task p.wrapped-task)
|
|
||||||
::
|
::
|
||||||
=/ event-core (per-event [our now eny scry-gate] duct ames-state)
|
=/ event-core (per-event [our now eny scry-gate] duct ames-state)
|
||||||
::
|
::
|
||||||
|
@ -251,10 +251,7 @@
|
|||||||
==
|
==
|
||||||
^- [(list move) _behn-gate]
|
^- [(list move) _behn-gate]
|
||||||
::
|
::
|
||||||
=/ =task:able
|
=/ =task:able ((harden task:able) wrapped-task)
|
||||||
?. ?=(%soft -.wrapped-task)
|
|
||||||
wrapped-task
|
|
||||||
;;(task:able p.wrapped-task)
|
|
||||||
::
|
::
|
||||||
=/ event-core (per-event [our now hen] state)
|
=/ event-core (per-event [our now hen] state)
|
||||||
::
|
::
|
||||||
|
@ -4068,11 +4068,7 @@
|
|||||||
==
|
==
|
||||||
^- [(list move) _..^$]
|
^- [(list move) _..^$]
|
||||||
::
|
::
|
||||||
=/ req=task:able
|
=/ req=task:able ((harden task:able) wrapped-task)
|
||||||
?. ?=(%soft -.wrapped-task)
|
|
||||||
wrapped-task
|
|
||||||
;;(task:able p.wrapped-task)
|
|
||||||
::
|
|
||||||
:: only one of these should be going at once, so queue
|
:: only one of these should be going at once, so queue
|
||||||
::
|
::
|
||||||
?: ?=(?(%info %merg %mont) -.req)
|
?: ?=(?(%info %merg %mont) -.req)
|
||||||
|
@ -516,10 +516,7 @@
|
|||||||
wrapped-task=(hobo task:able)
|
wrapped-task=(hobo task:able)
|
||||||
==
|
==
|
||||||
^+ [*(list move) ..^$]
|
^+ [*(list move) ..^$]
|
||||||
=/ task=task:able
|
=/ task=task:able ((harden task:able) wrapped-task)
|
||||||
?. ?=(%soft -.wrapped-task)
|
|
||||||
wrapped-task
|
|
||||||
;;(task:able p.wrapped-task)
|
|
||||||
:: the boot event passes thru %dill for initial duct distribution
|
:: the boot event passes thru %dill for initial duct distribution
|
||||||
::
|
::
|
||||||
?: ?=(%boot -.task)
|
?: ?=(%boot -.task)
|
||||||
|
@ -1985,11 +1985,7 @@
|
|||||||
|= [=duct type=* wrapped-task=(hobo task:able)]
|
|= [=duct type=* wrapped-task=(hobo task:able)]
|
||||||
^- [(list move) _http-server-gate]
|
^- [(list move) _http-server-gate]
|
||||||
::
|
::
|
||||||
=/ task=task:able
|
=/ task=task:able ((harden task:able) wrapped-task)
|
||||||
?. ?=(%soft -.wrapped-task)
|
|
||||||
wrapped-task
|
|
||||||
~| [%p-wrapped-task p.wrapped-task]
|
|
||||||
;;(task:able p.wrapped-task)
|
|
||||||
:: %crud: notifies us of an event failure
|
:: %crud: notifies us of an event failure
|
||||||
::
|
::
|
||||||
?: ?=(%crud -.task)
|
?: ?=(%crud -.task)
|
||||||
|
@ -6128,12 +6128,8 @@
|
|||||||
++ call
|
++ call
|
||||||
|= [=duct type=* wrapped-task=(hobo task:able)]
|
|= [=duct type=* wrapped-task=(hobo task:able)]
|
||||||
^- [(list move) _ford-gate]
|
^- [(list move) _ford-gate]
|
||||||
:: unwrap :task from :wrapped-task
|
|
||||||
::
|
::
|
||||||
=/ task=task:able
|
=/ task=task:able ((harden task:able) wrapped-task)
|
||||||
?. ?=(%soft -.wrapped-task)
|
|
||||||
wrapped-task
|
|
||||||
;;(task:able p.wrapped-task)
|
|
||||||
:: we wrap +per-event with a call that binds our event args
|
:: we wrap +per-event with a call that binds our event args
|
||||||
::
|
::
|
||||||
=* this-event (per-event [our duct now scry-gate] state.ax)
|
=* this-event (per-event [our duct now scry-gate] state.ax)
|
||||||
|
@ -1476,12 +1476,7 @@
|
|||||||
^- [(list move) _gall-payload]
|
^- [(list move) _gall-payload]
|
||||||
::
|
::
|
||||||
~| [%gall-call-failed duct q.hic]
|
~| [%gall-call-failed duct q.hic]
|
||||||
:: make sure our task is hard
|
=/ =task:able ((harden task:able) q.hic)
|
||||||
::
|
|
||||||
=/ =task:able
|
|
||||||
?. ?=(%soft -.q.hic)
|
|
||||||
q.hic
|
|
||||||
;; task:able p.q.hic
|
|
||||||
::
|
::
|
||||||
=/ initialised (mo-abed:mo duct)
|
=/ initialised (mo-abed:mo duct)
|
||||||
?- -.task
|
?- -.task
|
||||||
|
@ -306,11 +306,7 @@
|
|||||||
|= [=duct type=* wrapped-task=(hobo task:able)]
|
|= [=duct type=* wrapped-task=(hobo task:able)]
|
||||||
^- [(list move) _light-gate]
|
^- [(list move) _light-gate]
|
||||||
::
|
::
|
||||||
=/ task=task:able
|
=/ task=task:able ((harden task:able) wrapped-task)
|
||||||
?. ?=(%soft -.wrapped-task)
|
|
||||||
wrapped-task
|
|
||||||
~| [%p-wrapped-task p.wrapped-task]
|
|
||||||
;;(task:able p.wrapped-task)
|
|
||||||
:: %crud: notifies us of an event failure
|
:: %crud: notifies us of an event failure
|
||||||
::
|
::
|
||||||
?: ?=(%crud -.task)
|
?: ?=(%crud -.task)
|
||||||
|
@ -968,10 +968,7 @@
|
|||||||
hic/(hypo (hobo task:able))
|
hic/(hypo (hobo task:able))
|
||||||
==
|
==
|
||||||
^- [(list move) _..^$]
|
^- [(list move) _..^$]
|
||||||
=/ =task:able
|
=/ =task:able ((harden task:able) q.hic)
|
||||||
?. ?=($soft -.q.hic)
|
|
||||||
q.hic
|
|
||||||
(task:able p.q.hic)
|
|
||||||
=^ did lex
|
=^ did lex
|
||||||
abet:(~(call of [our now eny] lex) hen task)
|
abet:(~(call of [our now eny] lex) hen task)
|
||||||
[did ..^$]
|
[did ..^$]
|
||||||
|
Loading…
Reference in New Issue
Block a user