ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-19 12:51:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

ames: remove %cork from |ack-meat

Browse Source
This commit is contained in:
yosoyubik 2022-04-05 04:46:00 +02:00
parent c380cf3f42
commit a288d455c3
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -571,7 +571,7 @@
:: was processed during a single Arvo event. At the moment, .lag is :: was processed during a single Arvo event. At the moment, .lag is
:: always zero. :: always zero.
:: ::
+$ ack-meat (each fragment-num [ok=? cork=? lag=@dr]) +$ ack-meat (each fragment-num [ok=? lag=@dr])
:: $naxplanation: nack trace; explains which message failed and why :: $naxplanation: nack trace; explains which message failed and why
:: ::
+$ naxplanation [=message-num =error] +$ naxplanation [=message-num =error]
@ -2209,7 +2209,8 @@
=/ =message-pump-state =/ =message-pump-state
(~(gut by snd.peer-state) bone *message-pump-state) (~(gut by snd.peer-state) bone *message-pump-state)
:: ::
=/ message-pump (make-message-pump message-pump-state channel) =/ closing=? (~(has in closing.peer-state) bone)
=/ message-pump (make-message-pump message-pump-state channel closing)
=^ pump-gifts message-pump-state (work:message-pump task) =^ pump-gifts message-pump-state (work:message-pump task)
=. snd.peer-state (~(put by snd.peer-state) bone message-pump-state) =. snd.peer-state (~(put by snd.peer-state) bone message-pump-state)
:: process effects from |message-pump :: process effects from |message-pump
@ -2464,7 +2465,7 @@
:: +make-message-pump: constructor for |message-pump :: +make-message-pump: constructor for |message-pump
:: ::
++ make-message-pump ++ make-message-pump
|= [state=message-pump-state =channel] |= [state=message-pump-state =channel closing=?]
=* veb veb.bug.channel =* veb veb.bug.channel
=| gifts=(list message-pump-gift) =| gifts=(list message-pump-gift)
:: ::
@ -2503,9 +2504,21 @@
(on-hear [message-num fragment-num=p.ack-meat]:task) (on-hear [message-num fragment-num=p.ack-meat]:task)
:: ::
%| %|
~& [current.state message+message-num:task]
=/ cork=?
=/ top-live
(pry:packet-queue:*make-packet-pump live.packet-pump-state.state)
:: If we send a %cork and get an ack, we can know by
:: sequence number that the ack is for the %cork message
::
?& closing
?=(^ top-live)
=(1 ~(wyt by live.packet-pump-state.state))
=(message-num:task message-num.key.u.top-live)
==
=* ack p.ack-meat.task =* ack p.ack-meat.task
%- on-done %- on-done
[[message-num:task ?:(ok.ack [%ok ~] [%nack ~])] cork.ack] [[message-num:task ?:(ok.ack [%ok ~] [%nack ~])] cork]
== ==
%near (on-done [[message-num %naxplanation error]:naxplanation.task %&]) %near (on-done [[message-num %naxplanation error]:naxplanation.task %&])
== ==
@ -3170,7 +3183,7 @@
:: ::
=/ ok=? !(~(has in nax.state) seq) =/ ok=? !(~(has in nax.state) seq)
%- (trace rcv.veb |.("send dupe message ack {<seq=seq>} ok={<ok>}")) %- (trace rcv.veb |.("send dupe message ack {<seq=seq>} ok={<ok>}"))
(give %send seq %| ok %| lag=`@dr`0) (give %send seq %| ok lag=`@dr`0)
:: last-acked<seq<=last-heard; heard message, unprocessed :: last-acked<seq<=last-heard; heard message, unprocessed
:: ::
:: Only true if we've heard some packets we haven't acked, which :: Only true if we've heard some packets we haven't acked, which
@ -3291,7 +3304,7 @@
=. last-acked.state +(last-acked.state) =. last-acked.state +(last-acked.state)
=? nax.state !ok (~(put in nax.state) message-num) =? nax.state !ok (~(put in nax.state) message-num)
:: ::
=. message-sink (give %send message-num %| ok cork lag=`@dr`0) =. message-sink (give %send message-num %| ok lag=`@dr`0)
=? message-sink cork (give %cork ~) =? message-sink cork (give %cork ~)
=/ next ~(top to pending-vane-ack.state) =/ next ~(top to pending-vane-ack.state)
?~ next ?~ next