From ff19d5e6fe4c88bc7123676aae8ba4fc778a2dbd Mon Sep 17 00:00:00 2001 From: orignal Date: Tue, 3 Nov 2026 17:23:20 -0500 Subject: [PATCH] boost::intrusive::list for receive queue --- libi2pd/Streaming.cpp | 22 ++++++++-------------- libi2pd/Streaming.h | 5 +++-- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/libi2pd/Streaming.cpp b/libi2pd/Streaming.cpp index fe7171e8..13f893c5 100644 --- a/libi2pd/Streaming.cpp +++ b/libi2pd/Streaming.cpp @@ -201,9 +201,7 @@ namespace stream m_SendBuffer.CleanUp (); - for (auto it: m_ReceiveQueue) - delete it; - m_ReceiveQueue.clear (); + m_ReceiveQueue.clear_and_dispose([](Packet * p) { delete p; }); m_NACKedPackets.clear (); @@ -427,7 +425,7 @@ namespace stream size_t packetLength = packet->GetLength (); if (packetLength > 0) { - m_ReceiveQueue.push_back (packet); + m_ReceiveQueue.push_back (*packet); if (m_SizeToReceive) { if (packetLength < m_SizeToReceive) @@ -1494,18 +1492,14 @@ namespace stream auto it = m_ReceiveQueue.begin (); while (pos < len && it != m_ReceiveQueue.end ()) { - Packet * packet = *it; - size_t l = std::min (packet->GetLength (), len - pos); - memcpy (buf + pos, packet->GetBuffer (), l); + Packet& packet = *it; + size_t l = std::min (packet.GetLength (), len - pos); + memcpy (buf + pos, packet.GetBuffer (), l); pos += l; - packet->offset += l; - if (!packet->GetLength ()) - { - m_LocalDestination.DeletePacket (packet); - it++; - } + packet.offset += l; + if (!packet.GetLength ()) + it = m_ReceiveQueue.erase_and_dispose (it, [this](Packet * p){ m_LocalDestination.DeletePacket (p); }); } - m_ReceiveQueue.erase (m_ReceiveQueue.begin (), it); return pos; } diff --git a/libi2pd/Streaming.h b/libi2pd/Streaming.h index 24b68a11..0c47ffe7 100644 --- a/libi2pd/Streaming.h +++ b/libi2pd/Streaming.h @@ -18,6 +18,7 @@ #include #include #include +#include #include "Base.h" #include "Gzip.h" #include "I2PEndian.h" @@ -83,7 +84,7 @@ namespace stream const bool LOSS_BASED_CONTROL_ENABLED = 0; // 0/1 const uint64_t STREAMING_DESTINATION_POOLS_CLEANUP_INTERVAL = 646; // in seconds - struct Packet + struct Packet: boost::intrusive::list_base_hook<> { size_t len, offset; uint8_t buf[MAX_PACKET_SIZE]; @@ -292,7 +293,7 @@ namespace stream std::shared_ptr m_CurrentRemoteLease; std::shared_ptr m_NextRemoteLease; std::shared_ptr m_CurrentOutboundTunnel; - std::list m_ReceiveQueue; + boost::intrusive::list m_ReceiveQueue; size_t m_SizeToReceive; // before invoke AsyncReceive handler std::set m_SavedPackets; std::list m_SentPackets;