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

Merge pull request #6323 from urbit/i/6282/adjust-clog

Browse Source 
ames: add %cong task to adjust clog
This commit is contained in:
Josh Lehman 2023-02-13 06:55:29 -08:00 committed by GitHub
commit 9631e5c5ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 80 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/arvo/sys/lull.hoon
View File

@ -363,6 +363,8 @@
:: %sift: limit verbosity to .ships :: %sift: limit verbosity to .ships
:: %snub: set packet blacklist to .ships :: %snub: set packet blacklist to .ships
:: %spew: set verbosity toggles :: %spew: set verbosity toggles
:: %cong: adjust congestion control parameters
:: %stir: recover from timer desync
:: %trim: release memory :: %trim: release memory
:: %vega: kernel reload notification :: %vega: kernel reload notification
:: ::
@ -380,6 +382,7 @@
[%sift ships=(list ship)] [%sift ships=(list ship)]
[%snub ships=(list ship)] [%snub ships=(list ship)]
[%spew veb=(list verb)] [%spew veb=(list verb)]
[%cong msg=@ud mem=@ud]
[%stir arg=@t] [%stir arg=@t]
$>(%trim vane-task) $>(%trim vane-task)
$>(%vega vane-task) $>(%vega vane-task)

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

@ -609,6 +609,7 @@
:: crypto-core: interface for encryption and signing :: crypto-core: interface for encryption and signing
:: bug: debug printing configuration :: bug: debug printing configuration
:: snub: blocklist for incoming packets :: snub: blocklist for incoming packets
:: cong: parameters for marking a flow as clogged
:: ::
:: Note: .corks is only still present for unreleased migration reasons :: Note: .corks is only still present for unreleased migration reasons
:: ::
@ -621,6 +622,7 @@
=bug =bug
corks=(set wire) corks=(set wire)
snub=(set ship) snub=(set ship)
cong=[msg=@ud mem=@ud]
== ==
+$ ames-state-4 ames-state-5 +$ ames-state-4 ames-state-5
+$ ames-state-5 +$ ames-state-5
@ -703,6 +705,11 @@
ships=(set ship) ships=(set ship)
== ==
:: ::
+$ bug-10
$: veb=_[`?`%.n `?`%.n `?`%.n `?`%.n `?`%.n `?`%.n `?`%.n `?`%.n]
ships=(set ship)
==
::
+$ ames-state-9 +$ ames-state-9
$: peers=(map ship ship-state) $: peers=(map ship ship-state)
=unix=duct =unix=duct
@ -713,6 +720,16 @@
snub=(set ship) snub=(set ship)
== ==
:: ::
+$ ames-state-10
$: peers=(map ship ship-state)
=unix=duct
=life
crypto-core=acru:ames
bug=bug-10
corks=(set wire)
snub=(set ship)
==
::
:: $bug: debug printing configuration :: $bug: debug printing configuration
:: ::
:: veb: verbosity toggles :: veb: verbosity toggles
@ -876,7 +893,8 @@
[%7 ames-state-7] [%7 ames-state-7]
[%8 ames-state-8] [%8 ames-state-8]
[%9 ames-state-9] [%9 ames-state-9]
[%10 ^ames-state] [%10 ames-state-10]
[%11 ^ames-state]
== ==
:: ::
|= [now=@da eny=@ rof=roof] |= [now=@da eny=@ rof=roof]
@ -999,7 +1017,7 @@
:: lifecycle arms; mostly pass-throughs to the contained adult ames :: lifecycle arms; mostly pass-throughs to the contained adult ames
:: ::
++ scry scry:adult-core ++ scry scry:adult-core
++ stay [%10 %larva queued-events ames-state.adult-gate] ++ stay [%11 %larva queued-events ames-state.adult-gate]
++ load ++ load
|= $= old |= $= old
$% $: %4 $% $: %4
@ -1045,6 +1063,13 @@
[%adult state=ames-state-9] [%adult state=ames-state-9]
== == == ==
$: %10 $: %10
$% $: %larva
events=(qeu queued-event)
state=ames-state-10
==
[%adult state=ames-state-10]
== ==
$: %11
$% $: %larva $% $: %larva
events=(qeu queued-event) events=(qeu queued-event)
state=_ames-state.adult-gate state=_ames-state.adult-gate
@ -1109,12 +1134,22 @@
=. queued-events events.old =. queued-events events.old
larval-gate larval-gate
:: ::
[%10 %adult *] (load:adult-core %10 state.old) [%10 %adult *]
=. cached-state `[%10 state.old]
~> %slog.0^leaf/"ames: larva reload"
larval-gate
:: ::
[%10 %larva *] [%10 %larva *]
~> %slog.1^leaf/"ames: larva: load" ~> %slog.1^leaf/"ames: larva: load"
=. queued-events events.old =. queued-events events.old
=. adult-gate (load:adult-core %10 state.old) larval-gate
::
[%11 %adult *] (load:adult-core %11 state.old)
::
[%11 %larva *]
~> %slog.1^leaf/"ames: larva: load"
=. queued-events events.old
=. adult-gate (load:adult-core %11 state.old)
larval-gate larval-gate
:: ::
== ==
@ -1137,7 +1172,9 @@
9+(state-8-to-9:load:adult-core +.u.cached-state) 9+(state-8-to-9:load:adult-core +.u.cached-state)
=? u.cached-state ?=(%9 -.u.cached-state) =? u.cached-state ?=(%9 -.u.cached-state)
10+(state-9-to-10:load:adult-core +.u.cached-state) 10+(state-9-to-10:load:adult-core +.u.cached-state)
?> ?=(%10 -.u.cached-state) =? u.cached-state ?=(%10 -.u.cached-state)
11+(state-10-to-11:load:adult-core +.u.cached-state)
?> ?=(%11 -.u.cached-state)
=. ames-state.adult-gate +.u.cached-state =. ames-state.adult-gate +.u.cached-state
[moz larval-core(cached-state ~)] [moz larval-core(cached-state ~)]
-- --
@ -1178,6 +1215,7 @@
%sift (on-sift:event-core ships.task) %sift (on-sift:event-core ships.task)
%snub (on-snub:event-core ships.task) %snub (on-snub:event-core ships.task)
%spew (on-spew:event-core veb.task) %spew (on-spew:event-core veb.task)
%cong (on-cong:event-core [msg mem]:task)
%stir (on-stir:event-core arg.task) %stir (on-stir:event-core arg.task)
%trim on-trim:event-core %trim on-trim:event-core
%vega on-vega:event-core %vega on-vega:event-core
@ -1214,19 +1252,19 @@
[moves ames-gate] [moves ames-gate]
:: +stay: extract state before reload :: +stay: extract state before reload
:: ::
++ stay [%10 %adult ames-state] ++ stay [%11 %adult ames-state]
:: +load: load in old state after reload :: +load: load in old state after reload
:: ::
++ load ++ load
=< |= $= old-state =< |= $= old-state
$% [%10 ^ames-state] $% [%11 ^ames-state]
== ==
^+ ames-gate ^+ ames-gate
?> ?=(%10 -.old-state) ?> ?=(%11 -.old-state)
ames-gate(ames-state +.old-state) ames-gate(ames-state +.old-state)
:: all state transitions are called from larval ames
:: ::
|% |%
:: +state-4-to-5 called from larval-ames
:: ::
++ state-4-to-5 ++ state-4-to-5
|= ames-state=ames-state-4 |= ames-state=ames-state-4
@ -1244,7 +1282,6 @@
message-pump-state message-pump-state
ship-state ship-state
ames-state ames-state
:: +state-5-to-6 called from larval-ames
:: ::
++ state-5-to-6 ++ state-5-to-6
|= ames-state=ames-state-5 |= ames-state=ames-state-5
@ -1267,7 +1304,6 @@
:_ +.peer-state :_ +.peer-state
=, -.peer-state =, -.peer-state
[symmetric-key life rift public-key sponsor] [symmetric-key life rift public-key sponsor]
:: +state-6-to-7 called from larval-ames
:: ::
++ state-6-to-7 ++ state-6-to-7
|= ames-state=ames-state-6 |= ames-state=ames-state-6
@ -1282,41 +1318,42 @@
^- peer-state ^- peer-state
:- +<.ship-state :- +<.ship-state
[route qos ossuary snd rcv nax heeds ~ ~ ~]:ship-state [route qos ossuary snd rcv nax heeds ~ ~ ~]:ship-state
:: +state-7-to-8 called from larval-ames
:: ::
++ state-7-to-8 ++ state-7-to-8
|= ames-state=ames-state-7 |= ames-state=ames-state-7
^- ames-state-8 ^- ames-state-8
:* peers.ames-state =, ames-state
unix-duct.ames-state :* peers unix-duct life crypto-core bug
life.ames-state
crypto-core.ames-state
bug.ames-state
*(set wire) *(set wire)
== ==
::
++ state-8-to-9 ++ state-8-to-9
|= ames-state=ames-state-8 |= ames-state=ames-state-8
^- ames-state-9 ^- ames-state-9
:* peers.ames-state =, ames-state
unix-duct.ames-state :* peers unix-duct life crypto-core bug corks
life.ames-state
crypto-core.ames-state
bug.ames-state
corks.ames-state
*(set ship) *(set ship)
== ==
::
++ state-9-to-10 ++ state-9-to-10
|= ames-state=ames-state-9 |= ames-state=ames-state-9
^- ^^ames-state ^- ames-state-10
:* peers.ames-state =, ames-state
unix-duct.ames-state :* peers unix-duct life crypto-core
life.ames-state
crypto-core.ames-state
%= bug.ames-state %= bug.ames-state
veb [&1 &2 &3 &4 &5 &6 |6 %.n]:veb.bug.ames-state veb [&1 &2 &3 &4 &5 &6 |6 %.n]:veb.bug
== ==
corks.ames-state corks snub
snub.ames-state ==
::
++ state-10-to-11
|= ames-state=ames-state-10
^- ^^ames-state
=, ames-state
:* peers unix-duct life crypto-core bug corks snub
:: 5 messages and 100Kb of data outstanding
::
[msg=5 mem=100.000]
== ==
-- --
:: +scry: dereference namespace :: +scry: dereference namespace
@ -1583,6 +1620,13 @@
=. peer-core (run-message-pump:peer-core i.bones %prod ~) =. peer-core (run-message-pump:peer-core i.bones %prod ~)
$(bones t.bones) $(bones t.bones)
-- --
:: +on-cong: adjust congestion control parameters
::
++ on-cong
|= [msg=@ud mem=@ud]
^+ event-core
=. cong.ames-state msg^mem
event-core
:: +on-stir: recover from timer desync, setting new timers as needed :: +on-stir: recover from timer desync, setting new timers as needed
:: ::
:: .arg is unused, meant to ease future debug commands :: .arg is unused, meant to ease future debug commands
@ -2585,7 +2629,7 @@
(sub [next current]:i.pumps) (sub [next current]:i.pumps)
~(wyt in unsent-messages.i.pumps) ~(wyt in unsent-messages.i.pumps)
== ==
?: (gte num 5) ?: (gte num msg.cong.ames-state)
& &
$(pumps t.pumps) $(pumps t.pumps)
:: +nuf-memory: is enough memory used to mark as clogged? :: +nuf-memory: is enough memory used to mark as clogged?
@ -2600,7 +2644,7 @@
|=([a=@ b=_mem] (add b (met 3 a))) |=([a=@ b=_mem] (add b (met 3 a)))
?~ unsent-fragments.i.pumps 0 ?~ unsent-fragments.i.pumps 0
(met 3 fragment.i.unsent-fragments.i.pumps) (met 3 fragment.i.unsent-fragments.i.pumps)
?: (gte mem 100.000) ?: (gte mem mem.cong.ames-state)
& &
$(pumps t.pumps) $(pumps t.pumps)
-- --