mirror of
https://github.com/urbit/shrub.git
synced 2024-12-01 06:35:32 +03:00
Merge branch 'philip/gall-breach-ack' (#2873)
* origin/philip/gall-breach-ack: gall: clear outstanding ack queue on-load gall: clear outstanding ack queue to breaching ships Signed-off-by: Philip Monk <phil@pcmonk.me>
This commit is contained in:
commit
60cf03be45
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ecfe53c9e00d8cba244c85eb0ec0ed3b4e8ac07737bb0c6a7aa57d6c52f52c85
|
||||
size 15993675
|
||||
oid sha256:8da3208fcb4424da285159aa3d923bba941ad25a026b30ab0e58e54f4ecac80b
|
||||
size 12885759
|
||||
|
@ -55,7 +55,7 @@
|
||||
++ state
|
||||
$: :: state version
|
||||
::
|
||||
%4
|
||||
%5
|
||||
:: agents by ship
|
||||
::
|
||||
=agents
|
||||
@ -423,6 +423,12 @@
|
||||
=. mo-core (mo-untrack-ship ship)
|
||||
=. mo-core (mo-filter-queue ship)
|
||||
=/ agents=(list [name=term =running-agent]) ~(tap by running.agents.state)
|
||||
=. outstanding.agents.state
|
||||
%- malt
|
||||
%+ skip ~(tap by outstanding.agents.state)
|
||||
|= [[=wire duct] (qeu remote-request)]
|
||||
=(/sys/way/(scot %p ship) (scag 3 wire))
|
||||
::
|
||||
|- ^+ mo-core
|
||||
?~ agents
|
||||
mo-core
|
||||
@ -1679,16 +1685,32 @@
|
||||
=? all-state ?=(%3 -.all-state)
|
||||
(state-3-to-4 all-state)
|
||||
::
|
||||
?> ?=(%4 -.all-state)
|
||||
=? all-state ?=(%4 -.all-state)
|
||||
(state-4-to-5 all-state)
|
||||
::
|
||||
?> ?=(%5 -.all-state)
|
||||
gall-payload(state all-state)
|
||||
::
|
||||
:: +all-state: upgrade path
|
||||
::
|
||||
++ all-state $%(state-0 state-1 state-2 state-3 ^state)
|
||||
++ all-state $%(state-0 state-1 state-2 state-3 state-4 ^state)
|
||||
::
|
||||
++ state-4-to-5
|
||||
|= =state-4
|
||||
^- ^state
|
||||
%= state-4
|
||||
- %5
|
||||
outstanding.agents ~
|
||||
==
|
||||
::
|
||||
++ state-4
|
||||
$: %4
|
||||
=agents
|
||||
==
|
||||
::
|
||||
++ state-3-to-4
|
||||
|= =state-3
|
||||
^- ^state
|
||||
^- state-4
|
||||
%= state-3
|
||||
- %4
|
||||
outstanding.agents ~
|
||||
|
Loading…
Reference in New Issue
Block a user