+
Skip to content
This repository was archived by the owner on Aug 14, 2019. It is now read-only.

Behn pass errors to client vanes #1135

Merged
merged 7 commits into from
Apr 10, 2019
Merged

Behn pass errors to client vanes #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ba34592
[%wake (unit tang)] in Behn and Zuse; no other vanes compile
Apr 8, 2019
c23dbcf
ames compiles
Apr 8, 2019
9c09c6a
clay compiles
Apr 9, 2019
6f1f4dc
eyre compiles
Apr 9, 2019
6a128ba
jael compiles
Apr 9, 2019
ea79f80
Merge branch 'next' into time-fault
Apr 9, 2019
1a70fa6
Aqua send %crud on behn error
Apr 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions app/aqua-behn.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@
:: Received timer wake
::
++ wake
|= [way=wire ~]
|= [way=wire error=(unit tang)]
^- (quip move _this)
=. this apex =< abet
?> ?=([@ *] way)
=/ who (,@p (slav %p i.way))
abet-pe:(take-wake:(pe who) t.way ~)
abet-pe:(take-wake:(pe who) t.way error)
::
++ pe
|= who=ship
Expand Down Expand Up @@ -114,12 +114,18 @@
..abet-pe
::
++ take-wake
|= [way=wire ~]
~? debug=| [who=who %aqua-behn-wake now]
|= [way=wire error=(unit tang)]
~? debug=| [who=who %aqua-behn-wake now error=error]
=. next-timer ~
=. this
%- emit-aqua-events
[%event who [//behn/0v1n.2m9vh %wake ~]]~
:_ ~
^- aqua-event
:+ %event who
:- //behn/0v1n.2m9vh
?~ error
[%wake ~]
[%crud %fail u.error]
..abet-pe
--
--
8 changes: 8 additions & 0 deletions sys/vane/ames.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1374,6 +1374,12 @@
~/ %knap
|= [tea=wire hen=duct sih=sign:able]
^- [(list move) _+>]
:: if we got an error from behn, report it to %dill; TODO handle errors
::
?: ?=([%wake ^] +.sih)
=/ =flog:dill [%crud %wake u.error.sih]
[[hen %slip %d %flog flog]~ +>.$]
::
?- +<.sih
%crud [[[hen [%slip %d %flog +.sih]] ~] +>]
::
Expand Down Expand Up @@ -1421,6 +1427,8 @@
^- [p=(list boon) q=fort]
?- +<.sih
::
:: only handles the non-error %wake case; error case above
::
%wake
(~(wake am [our now fox ski]) hen)
::
Expand Down
37 changes: 29 additions & 8 deletions sys/vane/behn.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,25 @@
:: +born: urbit restarted; refresh :next-wake and store wakeup timer duct
::
++ born set-unix-wake(next-wake.state ~, unix-duct.state duct)
:: +crud: error report; hand off to %dill to be printed
:: +crud: handle failure of previous arvo event
::
++ crud
|= [p=@tas q=tang]
|= [tag=@tas error=tang]
^+ [moves state]
[[duct %slip %d %flog %crud p q]~ state]
:: behn must get activated before other vanes in a %wake
::
:: TODO: uncomment this case after switching %crud tags
::
:: We don't know how to handle other errors, so relay them to %dill
:: to be printed and don't treat them as timer failures.
::
:: ?. =(%wake tag)
:: ~& %behn-crud-not-first-activation^tag
:: [[duct %slip %d %flog %crud tag error]~ state]
::
?: =(~ timers.state) ~| %behn-crud-no-timer^tag^error !!
::
(wake `error)
:: +rest: cancel the timer at :date, then adjust unix wakeup
:: +wait: set a new timer at :date, then adjust unix wakeup
::
Expand All @@ -45,9 +58,15 @@
:: +wake: unix says wake up; process the elapsed timer and set :next-wake
::
++ wake
|= error=(unit tang)
^+ [moves state]
::
?~ timers.state ~|(%behn-wake-no-timer !!)
?~ timers.state ~| %behn-wake-no-timer^error !!
:: if we errored, pop the timer and notify the client vane of the error
::
?^ error
=< set-unix-wake
(emit-vane-wake(timers.state t.timers.state) duct.i.timers.state error)
:: if unix woke us too early, retry by resetting the unix wakeup timer
::
?: (gth date.i.timers.state now)
Expand All @@ -56,7 +75,7 @@
:: pop first timer, tell vane it has elapsed, and adjust next unix wakeup
::
=< set-unix-wake
(emit-vane-wake(timers.state t.timers.state) duct.i.timers.state)
(emit-vane-wake(timers.state t.timers.state) duct.i.timers.state ~)
:: +wegh: produce memory usage report for |mass
::
++ wegh
Expand All @@ -74,7 +93,9 @@
++ event-core .
:: +emit-vane-wake: produce a move to wake a vane; assumes no prior moves
::
++ emit-vane-wake |=(=^duct event-core(moves [duct %give %wake ~]~))
++ emit-vane-wake
|= [=^duct error=(unit tang)]
event-core(moves [duct %give %wake error]~)
:: +emit-doze: set new unix wakeup timer in state and emit move to unix
::
:: We prepend the unix %doze event so that it is handled first. Arvo must
Expand Down Expand Up @@ -186,11 +207,11 @@
=^ moves state
?- -.task
%born born:event-core
%crud (crud:event-core [p q]:task)
%crud (crud:event-core [tag tang]:task)
%rest (rest:event-core date=p.task)
%vega vega:event-core
%wait (wait:event-core date=p.task)
%wake wake:event-core
%wake (wake:event-core error=~)
%wegh wegh:event-core
==
[moves behn-gate]
Expand Down
7 changes: 6 additions & 1 deletion sys/vane/clay.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@
$% [%made date=@da result=made-result:ford] ::
== == ::
$: $b ::
$% {$wake ~} :: timer activate
$% {$wake error=(unit tang)} :: timer activate
== == ::
$: @tas :: by any
$% {$crud p/@tas q/(list tank)} ::
Expand Down Expand Up @@ -4242,6 +4242,11 @@
::
$note [[hen %give +.q.hin]~ ..^$]
$wake
:: TODO: handle behn errors
::
?^ error.q.hin
[[hen %slip %d %flog %crud %wake u.error.q.hin]~ ..^$]
::
?: ?=([%tyme ~] tea)
~& %out-of-tyme
`..^$
Expand Down
7 changes: 6 additions & 1 deletion sys/vane/eyre.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
$% {$woot p/ship q/coop} :: acknowledgment
== == ::
$: $b :: by %behn
$% {$wake ~} :: timer activate
$% {$wake error=(unit tang)} :: timer activate
== == ::
$: $g :: by %gall
$% {$unto p/cuft:gall} :: within agent
Expand Down Expand Up @@ -1028,6 +1028,11 @@
==
::
$wake
:: TODO: handle behn errors
::
?^ error.sih
+>.$(mow [[hen %slip %d %flog %crud %wake u.error.sih] mow])
::
?> ?=({?($of $ow) @ ~} tee)
?: ?=($ow -.tee)
abut:(ire-ix p.tee)
Expand Down
6 changes: 6 additions & 0 deletions sys/vane/jael.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,12 @@
?. ?=([%init ~] wir)
abet:~(wake et hen our now urb.lex sub.lex etn.lex sap.lex)
abet:(~(init et hen our now [urb sub etn sap]:lex) our (sein our))
::
[%b %wake ^]
:: TODO: handle behn error
::
~& %jael-wake-bad^u.error.hin
+>.$
::
[%j %vent *]
%+ cute hen =< abet
Expand Down
47 changes: 24 additions & 23 deletions sys/zuse.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
== ::
++ sign :: in result _<-
$% $: $b :: to %behn
$% {$wake ~} :: timer activate
$% {$wake error=(unit tang)} :: timer activate
== == ::
$: %j :: from %jael
$% [%pubs public:able:jael] :: public keys
Expand Down Expand Up @@ -424,23 +424,23 @@
++ able ^?
|%
++ note :: out request $->
$% $: $d :: to %dill
$% {$flog p/flog:dill} ::
== == == ::
$% $: %d :: to %dill
$% [$flog =flog:dill]
== == ==
++ gift :: out result <-$
$% {$doze p/(unit @da)} :: next alarm
{$mass p/mass} :: memory usage
{$wake ~} :: wakeup
== ::
$% [%doze p=(unit @da)] :: next alarm
[%mass p=mass] :: memory usage
[%wake error=(unit tang)] :: wakeup or failed
==
++ task :: in request ->$
$% {$born ~} :: new unix process
{$crud p/@tas q/(list tank)} :: error with trace
{$rest p/@da} :: cancel alarm
{$vega ~} :: report upgrade
{$wait p/@da} :: set alarm
{$wake ~} :: timer activate
{$wegh ~} :: report memory
== ::
$% [%born ~] :: new unix process
[%crud tag=@tas =tang] :: error with trace
[%rest p=@da] :: cancel alarm
[%vega ~] :: report upgrade
[%wait p=@da] :: set alarm
[%wake ~] :: timer activate
[%wegh ~] :: report memory
==
-- ::able
-- ::behn
:: ::::
Expand Down Expand Up @@ -1849,7 +1849,7 @@
+$ seed [who=ship lyf=life key=ring sig=(unit oath:pki)]
::
++ sign :: in result $<-
$% {$b $wake ~} :: wakeup
$% {$b $wake error=(unit tang)} :: wakeup
[%e %sigh p=cage] :: marked http response
[%j %vent p=vent-result] :: ethereum changes
[%a %woot p=ship q=coop] :: message result
Expand Down Expand Up @@ -7099,16 +7099,17 @@
++ unix-task :: input from unix
$% {$belt p/belt:dill} :: dill: keyboard
{$blew p/blew:dill} :: dill: configure
{$boat ~} :: clay: reboot
{$born ~} :: eyre: new process
{$hail ~} :: dill: refresh
{$boat ~} :: clay: reboot
{$born ~} :: eyre: new process
[%crud tag=@tas =tang] :: any vane: error report
{$hail ~} :: dill: refresh
{$hear p/lane:ames q/@} :: ames: input packet
{$hook ~} :: dill: hangup
{$hook ~} :: dill: hangup
{$into p/desk q/? r/mode:clay} :: clay: external edit
{$they p/@ud q/httr:eyre} :: eyre: in response
{$this p/? q/clip:eyre r/httq:eyre} :: eyre: in request
{$thud ~} :: eyre: in cancel
{$wake ~} :: behn: wakeup
{$thud ~} :: eyre: in cancel
{$wake ~} :: behn: wakeup
==
:: ::
:::: ++azimuth :: (2az) azimuth
Expand Down
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载