something here broke it

- accounting for rounded down bytes

solanaceae/ngc_ft1/cca.hpp

@@ -64,8 +64,6 @@ struct CCAI {
 		// get the list of timed out seq_ids
 		virtual std::vector<SeqIDType> getTimeouts(void) const = 0;
 
-		virtual int64_t inFlightCount(void) const { return -1; }
-
 	public: // callbacks
 		// data size is without overhead
 		virtual void onSent(SeqIDType seq, size_t data_size) = 0;

solanaceae/ngc_ft1/flow_only.cpp

@@ -98,10 +98,6 @@ std::vector<FlowOnly::SeqIDType> FlowOnly::getTimeouts(void) const {
 	return list;
 }
 
-int64_t FlowOnly::inFlightCount(void) const {
-	return _in_flight.size();
-}
-
 void FlowOnly::onSent(SeqIDType seq, size_t data_size) {
 	if constexpr (true) {
 		for (const auto& it : _in_flight) {
@@ -109,17 +105,15 @@ void FlowOnly::onSent(SeqIDType seq, size_t data_size) {
 		}
 	}
 
-	const auto& new_entry = _in_flight.emplace_back(
+	_in_flight.push_back(
 		FlyingBunch{
 			seq,
 			static_cast<float>(getTimeNow()),
-			data_size + SEGMENT_OVERHEAD,
-			false
+			data_size + SEGMENT_OVERHEAD
 		}
 	);
-	_in_flight_bytes += new_entry.bytes;
-
-	_time_point_last_update = getTimeNow();
+	_in_flight_bytes += data_size + SEGMENT_OVERHEAD;
+	//_recently_sent_bytes += data_size + SEGMENT_OVERHEAD;
 }
 
 void FlowOnly::onAck(std::vector<SeqIDType> seqs) {

solanaceae/ngc_ft1/flow_only.hpp

@@ -75,8 +75,6 @@ struct FlowOnly : public CCAI {
 		// get the list of timed out seq_ids
 		std::vector<SeqIDType> getTimeouts(void) const override;
 
-		int64_t inFlightCount(void) const override;
-
 	public: // callbacks
 		// data size is without overhead
 		void onSent(SeqIDType seq, size_t data_size) override;

solanaceae/ngc_ft1/ngcft1.cpp

@@ -217,7 +217,7 @@ void NGCFT1::updateSendTransfer(float time_delta, uint32_t group_number, uint32_
 				// timeout increases with active transfers (otherwise we could starve them)
 				if (tf.time_since_activity >= (sending_give_up_after * peer.active_send_transfers)) {
 					// no ack after 30sec, close ft
-					std::cerr << "NGCFT1 warning: sending ft in progress timed out, deleting (ifc:" << peer.cca->inFlightCount() << ")\n";
+					std::cerr << "NGCFT1 warning: sending ft in progress timed out, deleting\n";
 					dispatch(
 						NGCFT1_Event::send_done,
 						Events::NGCFT1_send_done{
@@ -316,7 +316,7 @@ void NGCFT1::iteratePeer(float time_delta, uint32_t group_number, uint32_t peer_
 			}
 		}
 
-		// change iterate start position to not starve transfers in the back
+		// change iterat start position to not starve transfers in the back
 		size_t iterated_count = 0;
 		bool last_send_found = false;
 		for (size_t idx = peer.next_send_transfer_send_idx; iterated_count < peer.send_transfers.size(); idx++, iterated_count++) {
@@ -686,7 +686,7 @@ bool NGCFT1::onEvent(const Events::NGCEXT_ft1_data_ack& e) {
 
 	// delete if all packets acked
 	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\n";
 		dispatch(
 			NGCFT1_Event::send_done,
 			Events::NGCFT1_send_done{