urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-24 11:24:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

ames: try next recork on cork ack

Browse Source 
Without this, a ship would send a cork on a max of one flow per
recork timer, which could take years to clear for some ships.
This starts a hot loop of trying the next cork once one gets
positively acked.
This commit is contained in:
Ted Blackman 2022-08-05 01:35:34 +03:00
parent 54cd1a5eca
commit 56d4906a13
1 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
pkg/arvo/sys/vane/ames.hoon
View File

@ -1831,42 +1831,18 @@
:: ::
=. event-core =. event-core
(emit duct %pass /recork %b %wait `@da`(add now ~m20)) (emit duct %pass /recork %b %wait `@da`(add now ~m20))
:: recork up to one bone per peer
:: ::
=/ pez ~(tap by peers.ames-state) =/ pez ~(tap by peers.ames-state)
|- ^+ event-core |- ^+ event-core
=* ship-loop $
?~ pez event-core ?~ pez event-core
=+ [her sat]=i.pez =+ [her sat]=i.pez
?. ?=(%known -.sat) ?. ?=(%known -.sat)
ship-loop(pez t.pez) $(pez t.pez)
=* peer-state +.sat =* peer-state +.sat
=/ boz (sort ~(tap in closing.peer-state) lte) =/ =channel [[our her] now channel-state -.peer-state]
|- ^+ event-core =/ peer-core (make-peer-core peer-state channel)
=* bone-loop $ $(pez t.pez, event-core abet:recork-one:peer-core)
?~ boz ship-loop(pez t.pez)
=/ pum=message-pump-state (~(got by snd.peer-state) i.boz)
?: =(next current):pum
bone-loop(boz t.boz)
:: sanity check on the message pump state
::
?. ?& =(~ unsent-messages.pum)
=(~ unsent-fragments.pum)
=(~ live.packet-pump-state.pum)
==
~> %slog.0^leaf/"ames: incoherent pump state {<[her i.boz]>}"
bone-loop(boz t.boz)
:: no outstanding messages, so send a new %cork
::
:: TODO use +trace
~> %slog.0^leaf/"ames: recork {<[her i.boz]>}"
::
=. event-core
=/ =channel [[our her] now channel-state -.peer-state]
=/ peer-core (make-peer-core peer-state channel)
=/ =plea [%$ /flow [%cork ~]]
abet:(on-memo:peer-core i.boz plea %plea)
::
ship-loop(pez t.pez)
:: +on-init: first boot; subscribe to our info from jael :: +on-init: first boot; subscribe to our info from jael
:: ::
++ on-init ++ on-init
@ -2573,6 +2549,30 @@
our-life.channel her-life.channel our-life.channel her-life.channel
== ==
peer-core peer-core
:: +recork-one: re-send the next %cork to the peer
::
++ recork-one
^+ peer-core
=/ boz (sort ~(tap in closing.peer-state) lte)
|- ^+ peer-core
?~ boz peer-core
=/ pum=message-pump-state (~(got by snd.peer-state) i.boz)
?: =(next current):pum
$(boz t.boz)
:: sanity check on the message pump state
::
?. ?& =(~ unsent-messages.pum)
=(~ unsent-fragments.pum)
=(~ live.packet-pump-state.pum)
==
~> %slog.0^leaf/"ames: bad pump state {<[her.channel i.boz]>}"
$(boz t.boz)
:: no outstanding messages, so send a new %cork
::
:: TODO use +trace
~> %slog.0^leaf/"ames: recork {<[her.channel i.boz]>}"
=/ =plea [%$ /flow [%cork ~]]
(on-memo i.boz plea %plea)
:: +got-duct: look up $duct by .bone, asserting already bound :: +got-duct: look up $duct by .bone, asserting already bound
:: ::
++ got-duct ++ got-duct
@ -2669,8 +2669,10 @@
by-duct.ossuary (~(del by by-duct.ossuary) (got-duct bone)) by-duct.ossuary (~(del by by-duct.ossuary) (got-duct bone))
by-bone.ossuary (~(del by by-bone.ossuary) bone) by-bone.ossuary (~(del by by-bone.ossuary) bone)
== ==
peer-core :: since we got one cork ack, try the next one
:: +on-pump-krock: if we get a nack for a cork, add it to the recork set ::
recork-one
:: +on-pump-kroc: if we get a nack for a cork, add it to the recork set
:: ::
++ on-pump-kroc ++ on-pump-kroc
|= =^bone |= =^bone