From 6d7d6432076ca5fbf2731e59f596b8dd1503a6e4 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Mon, 16 Dec 2024 12:52:33 +0100 Subject: [PATCH] adjust flow to iterate speed higher ft1sha1 iterate interval (not fixing it yet) --- solanaceae/ngc_ft1/flow_only.cpp | 4 +++- solanaceae/ngc_ft1_sha1/sha1_ngcft1.cpp | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/solanaceae/ngc_ft1/flow_only.cpp b/solanaceae/ngc_ft1/flow_only.cpp index 01e8abf..7f45ec2 100644 --- a/solanaceae/ngc_ft1/flow_only.cpp +++ b/solanaceae/ngc_ft1/flow_only.cpp @@ -7,7 +7,9 @@ float FlowOnly::getCurrentDelay(void) const { // below 1ms is useless - return std::clamp(_rtt_ema, 0.001f, RTT_MAX); + //return std::clamp(_rtt_ema, 0.001f, RTT_MAX); + // the current iterate rate min is 5ms + return std::clamp(_rtt_ema, 0.005f, RTT_MAX); } void FlowOnly::addRTT(float new_delay) { diff --git a/solanaceae/ngc_ft1_sha1/sha1_ngcft1.cpp b/solanaceae/ngc_ft1_sha1/sha1_ngcft1.cpp index e3df546..a525a43 100644 --- a/solanaceae/ngc_ft1_sha1/sha1_ngcft1.cpp +++ b/solanaceae/ngc_ft1_sha1/sha1_ngcft1.cpp @@ -467,9 +467,9 @@ float SHA1_NGCFT1::iterate(float delta) { if (_peer_open_requests.empty()) { return 2.f; } else { - // pretty conservative and should be ajusted on a per peer, per delay basis - // seems to do the trick - return 0.05f; + // ft1 will go lower for us, if we have unresolved info, + // we dont want to be stuck in a high tickrate + return 0.5f; } }