Green-Sky/solanaceae_ngc_ft1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Green-Sky:151ddc38b256d123e37f46648917e8e7f7932682
Branches Tags
Green-Sky:master Green-Sky:ignore_timed_out_for_in_flight Green-Sky:broken_somehow Green-Sky:cca_rework
...
compare: Green-Sky:1319c11daf618b0609e57cfd046f843783daf7a3
Branches Tags
Green-Sky:master Green-Sky:ignore_timed_out_for_in_flight Green-Sky:broken_somehow Green-Sky:cca_rework

2 Commits
151ddc38b2 ... 1319c11daf

Author SHA1 Message Date
Green Sky
1319c11daf fix receiving transfers sometimes failing to adjust tick interval 2025-12-12 14:57:48 +01:00
Green Sky
21d38a2a9d make onCongestion cca interface 2025-12-12 14:55:58 +01:00
3 changed files with 5 additions and 4 deletions
Expand all files Collapse all files

3
solanaceae/ngc_ft1/cca.hpp
View File

@@ -70,5 +70,8 @@ struct CCAI {
// if discard, not resent, not inflight // if discard, not resent, not inflight
virtual void onLoss(SeqIDType seq, bool discard) = 0; virtual void onLoss(SeqIDType seq, bool discard) = 0;
// signal congestion externally (eg. send queue is full)
virtual void onCongestion(void) {};
}; };

2
solanaceae/ngc_ft1/flow_only.hpp
View File

@@ -58,8 +58,6 @@ struct FlowOnly : public CCAI {
void updateWindow(void); void updateWindow(void);
virtual void onCongestion(void) {};
// internal logic, calls the onCongestion() event // internal logic, calls the onCongestion() event
void updateCongestion(void); void updateCongestion(void);

4
solanaceae/ngc_ft1/ngcft1.cpp
View File

@@ -189,7 +189,7 @@ bool NGCFT1::iteratePeer(float time_delta, uint32_t group_number, uint32_t peer_
recv_activity = true; // count as activity, not sure we need this recv_activity = true; // count as activity, not sure we need this
} else { } else {
transfer.timer += time_delta; transfer.timer += time_delta;
if (transfer.timer < 0.5f) { if (transfer.timer < 2.f) {
// back off when no activity // back off when no activity
recv_activity = true; recv_activity = true;
} }
@@ -669,6 +669,7 @@ bool NGCFT1::onEvent(const Events::NGCEXT_ft1_data_ack& e) {
} }
// delete if all packets acked // delete if all packets acked
// TODO: check for FINISHING state?
if (transfer.file_size == transfer.file_size_current && transfer.ssb.size() == 0) { if (transfer.file_size == transfer.file_size_current && transfer.ssb.size() == 0) {
std::cout << "NGCFT1: " << int(e.transfer_id) << " done. wnd:" << peer.cca->getWindow() << "\n"; std::cout << "NGCFT1: " << int(e.transfer_id) << " done. wnd:" << peer.cca->getWindow() << "\n";
dispatch( dispatch(
@@ -678,7 +679,6 @@ bool NGCFT1::onEvent(const Events::NGCEXT_ft1_data_ack& e) {
e.transfer_id, e.transfer_id,
} }
); );
// TODO: check for FINISHING state
peer.send_transfers[e.transfer_id].reset(); peer.send_transfers[e.transfer_id].reset();
} }