boost::intrusive::list for receive queue

This commit is contained in:
orignal committed 2026-11-03 17:23:20 -05:00
1 parent 3dfbc30c54
commit ff19d5e6fe
2 files changed
+11 -16

No files matched your search

+8 -14
View File
@@ -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;
}
+3 -2
View File
@@ -18,6 +18,7 @@
#include <memory>
#include <mutex>
#include <boost/asio.hpp>
#include <boost/intrusive/list.hpp>
#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<const i2p::data::Lease> m_CurrentRemoteLease;
std::shared_ptr<const i2p::data::Lease> m_NextRemoteLease;
std::shared_ptr<i2p::tunnel::OutboundTunnel> m_CurrentOutboundTunnel;
std::list<Packet *> m_ReceiveQueue;
boost::intrusive::list<Packet> m_ReceiveQueue;
size_t m_SizeToReceive; // before invoke AsyncReceive handler
std::set<Packet *, PacketCmp> m_SavedPackets;
std::list<Packet *> m_SentPackets;