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

ames: remove mu/mi-trace

Browse Source
This commit is contained in:
yosoyubik 2023-03-24 12:44:20 +01:00
parent ce02fecc41
commit 3269192b29
1 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2805,13 +2805,8 @@
peer-core peer-core
:: ::
++ packet-pump (pu packet-pump-state.state) ++ packet-pump (pu packet-pump-state.state)
++ mu-trace ++ closing (~(has in closing.peer-state) bone)
|= [verb=? print=(trap tape)] ++ corked (~(has in corked.peer-state) bone)
^+ same
(trace verb her ships.bug.channel print)
::
++ closing (~(has in closing.peer-state) bone)
++ corked (~(has in corked.peer-state) bone)
:: +is-message-num-in-range: %.y unless duplicate or future ack :: +is-message-num-in-range: %.y unless duplicate or future ack
:: ::
++ is-message-num-in-range ++ is-message-num-in-range
@ -2879,7 +2874,7 @@
[[msg ?:(ok.ack [%ok ~] [%nack ~])] cork] [[msg ?:(ok.ack [%ok ~] [%nack ~])] cork]
?. &(!ok.ack cork) pump ?. &(!ok.ack cork) pump
%. pump %. pump
%+ mu-trace odd.veb %+ pe-trace odd.veb
|.("got nack for %cork {<bone=bone message-num=msg>}") |.("got nack for %cork {<bone=bone message-num=msg>}")
== == == ==
:: +on-memo: handle request to send a message :: +on-memo: handle request to send a message
@ -2896,7 +2891,7 @@
:: ::
?. (is-message-num-in-range message-num) ?. (is-message-num-in-range message-num)
%. pump %. pump
(mu-trace snd.veb |.("hear pump out of range")) (pe-trace snd.veb |.("hear pump out of range"))
abet:(call:packet-pump %hear message-num fragment-num) abet:(call:packet-pump %hear message-num fragment-num)
:: +on-done: handle message acknowledgment :: +on-done: handle message acknowledgment
:: ::
@ -2925,7 +2920,7 @@
:: ::
?: (lth message-num current.state) ?: (lth message-num current.state)
%. pump %. pump
%+ mu-trace snd.veb |. %+ pe-trace snd.veb |.
"duplicate done {<current=current.state message-num=message-num>}" "duplicate done {<current=current.state message-num=message-num>}"
:: ignore duplicate and future acks :: ignore duplicate and future acks
:: ::
@ -3422,13 +3417,8 @@
=? rcv.peer-state !corked (~(put by rcv.peer-state) bone state) =? rcv.peer-state !corked (~(put by rcv.peer-state) bone state)
peer-core peer-core
:: ::
++ mi-trace ++ closing (~(has in closing.peer-state) bone)
|= [verb=? print=(trap tape)] ++ corked (~(has in corked.peer-state) bone)
^+ same
(trace verb her ships.bug.channel print)
::
++ closing (~(has in closing.peer-state) bone)
++ corked (~(has in corked.peer-state) bone)
++ received ++ received
|= =^bone |= =^bone
:: odd bone: %plea request message :: odd bone: %plea request message
@ -3461,7 +3451,7 @@
%+ send-shut-packet bone %+ send-shut-packet bone
[message-num.shut-packet.task %| %| ok=& lag=*@dr] [message-num.shut-packet.task %| %| ok=& lag=*@dr]
%. sink %. sink
%+ mi-trace odd.veb %+ pe-trace odd.veb
|.("hear {<(received bone)>} on corked bone={<bone>}") |.("hear {<(received bone)>} on corked bone={<bone>}")
== ==
:: ::
@ -3481,7 +3471,7 @@
:: ignore messages from far future; limit to 10 in progress :: ignore messages from far future; limit to 10 in progress
:: ::
?: (gte seq (add 10 last-acked.state)) ?: (gte seq (add 10 last-acked.state))
%- %+ mi-trace odd.veb %- %+ pe-trace odd.veb
|.("future %hear {<seq=seq last-acked=last-acked.state>}") |.("future %hear {<seq=seq last-acked=last-acked.state>}")
sink sink
:: ::
@ -3494,14 +3484,14 @@
:: ::
=. peer-core (send-shut-packet bone seq %| %& fragment-num) =. peer-core (send-shut-packet bone seq %| %& fragment-num)
%. sink %. sink
%+ mi-trace rcv.veb %+ pe-trace rcv.veb
|.("send dupe ack {<seq=seq^fragment-num=fragment-num>}") |.("send dupe ack {<seq=seq^fragment-num=fragment-num>}")
:: whole message (n)ack :: whole message (n)ack
:: ::
=/ ok=? !(~(has in nax.state) seq) =/ ok=? !(~(has in nax.state) seq)
=. peer-core (send-shut-packet bone seq %| %| ok lag=`@dr`0) =. peer-core (send-shut-packet bone seq %| %| ok lag=`@dr`0)
%. sink %. sink
%+ mi-trace rcv.veb %+ pe-trace rcv.veb
|.("send dupe message ack {<seq=seq>} ok={<ok>}") |.("send dupe message ack {<seq=seq>} ok={<ok>}")
:: last-acked<seq<=last-heard; heard message, unprocessed :: last-acked<seq<=last-heard; heard message, unprocessed
:: ::
@ -3513,7 +3503,7 @@
:: if not from a closing bone, drop last packet, :: if not from a closing bone, drop last packet,
:: since we don't know whether to ack or nack :: since we don't know whether to ack or nack
:: ::
%- %+ mi-trace rcv.veb %- %+ pe-trace rcv.veb
|. ^- tape |. ^- tape
=/ data =/ data
:* her seq=seq bone=bone.shut-packet :* her seq=seq bone=bone.shut-packet
@ -3525,7 +3515,7 @@
:: ack all other packets :: ack all other packets
:: ::
=. peer-core (send-shut-packet bone seq %| %& fragment-num) =. peer-core (send-shut-packet bone seq %| %& fragment-num)
%- %+ mi-trace rcv.veb |. %- %+ pe-trace rcv.veb |.
=/ data =/ data
:* seq=seq fragment-num=fragment-num :* seq=seq fragment-num=fragment-num
num-fragments=num-fragments closing=closing num-fragments=num-fragments closing=closing
@ -3552,14 +3542,14 @@
:: ::
?: already-heard-fragment ?: already-heard-fragment
?: is-last-fragment ?: is-last-fragment
%- %+ mi-trace rcv.veb |. %- %+ pe-trace rcv.veb |.
=/ data =/ data
[her seq=seq lh=last-heard.state la=last-acked.state] [her seq=seq lh=last-heard.state la=last-acked.state]
"hear last dupe {<data>}" "hear last dupe {<data>}"
sink sink
=. peer-core (send-shut-packet bone seq %| %& fragment-num) =. peer-core (send-shut-packet bone seq %| %& fragment-num)
%. sink %. sink
%+ mi-trace rcv.veb %+ pe-trace rcv.veb
|.("send dupe ack {<her^seq=seq^fragment-num=fragment-num>}") |.("send dupe ack {<her^seq=seq^fragment-num=fragment-num>}")
:: new fragment; store in state and check if message is done :: new fragment; store in state and check if message is done
:: ::
@ -3574,7 +3564,7 @@
:: ack any packet other than the last one, and continue either way :: ack any packet other than the last one, and continue either way
:: ::
=? peer-core !is-last-fragment =? peer-core !is-last-fragment
%- %+ mi-trace rcv.veb |. %- %+ pe-trace rcv.veb |.
=/ data =/ data
[seq=seq fragment-num=fragment-num fragments=num-fragments] [seq=seq fragment-num=fragment-num fragments=num-fragments]
"send ack-2 {<data>}" "send ack-2 {<data>}"
@ -3599,7 +3589,7 @@
=. last-heard.state +(last-heard.state) =. last-heard.state +(last-heard.state)
=. live-messages.state (~(del by live-messages.state) seq) =. live-messages.state (~(del by live-messages.state) seq)
:: ::
%- %+ mi-trace msg.veb %- %+ pe-trace msg.veb
|.("hear {<her>} {<seq=seq>} {<num-fragments.u.live>}kb") |.("hear {<her>} {<seq=seq>} {<num-fragments.u.live>}kb")
=/ message=* (assemble-fragments [num-fragments fragments]:u.live) =/ message=* (assemble-fragments [num-fragments fragments]:u.live)
=/ empty=? =(~ pending-vane-ack.state) =/ empty=? =(~ pending-vane-ack.state)
@ -3640,7 +3630,7 @@
++ ha-plea ++ ha-plea
^+ sink ^+ sink
?: |(closing corked) sink ?: |(closing corked) sink
%- %+ mi-trace msg.veb %- %+ pe-trace msg.veb
=/ dat [her bone=bone message-num=message-num] =/ dat [her bone=bone message-num=message-num]
|.("sink plea {<dat>}") |.("sink plea {<dat>}")
=; pe=_peer-core =; pe=_peer-core
@ -3688,7 +3678,7 @@
++ ha-boon ++ ha-boon
^+ sink ^+ sink
?: |(closing corked) sink ?: |(closing corked) sink
%- %+ mi-trace msg.veb |. %- %+ pe-trace msg.veb |.
:: XX -.task not visible, FIXME :: XX -.task not visible, FIXME
:: ::
=/ dat [her bone=bone message-num=message-num] =/ dat [her bone=bone message-num=message-num]
@ -3711,7 +3701,7 @@
:: if we get a naxplanation for a %cork, the publisher hasn't :: if we get a naxplanation for a %cork, the publisher hasn't
:: received the OTA. The /recork timer will retry eventually. :: received the OTA. The /recork timer will retry eventually.
:: ::
%- %+ mi-trace msg.veb %- %+ pe-trace msg.veb
=/ dat [her bone=bone message-num=message-num] =/ dat [her bone=bone message-num=message-num]
|.("sink naxplanation {<dat>}") |.("sink naxplanation {<dat>}")
:: flip .bone's second bit to find referenced flow :: flip .bone's second bit to find referenced flow