From 44bb8f6f1691176978390b753a325b92b42fbf00 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Wed, 10 Jun 2020 21:19:37 -0400
Subject: [PATCH] allocated datagram I2NP from memory pool

---
 libi2pd/Datagram.cpp | 18 ++++++------------
 libi2pd/Datagram.h   |  4 ++--
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/libi2pd/Datagram.cpp b/libi2pd/Datagram.cpp
index 99318ec9..5a196c3a 100644
--- a/libi2pd/Datagram.cpp
+++ b/libi2pd/Datagram.cpp
@@ -152,7 +152,7 @@ namespace datagram
 		const std::vector<std::pair<const uint8_t *, size_t> >& payloads,
 		uint16_t fromPort, uint16_t toPort, bool isRaw, bool checksum)
 	{
-		auto msg = NewI2NPMessage ();
+		auto msg = m_I2NPMsgsPool.AcquireShared ();
 		uint8_t * buf = msg->GetPayload ();
 		buf += 4; // reserve for length
 		size_t size = m_Gzip ? m_Deflator.Deflate (payloads, buf, msg->maxLen - msg->len) :
@@ -239,9 +239,11 @@ namespace datagram
 	{
 		// we used this session
 		m_LastUse = i2p::util::GetMillisecondsSinceEpoch();
-		// schedule send
-		auto self = shared_from_this();
-		m_LocalDestination->GetService().post(std::bind(&DatagramSession::HandleSend, self, msg));
+		if (msg || m_SendQueue.empty ())
+			m_SendQueue.push_back(msg);
+		// flush queue right away if full
+		if (!msg || m_SendQueue.size() >= DATAGRAM_SEND_QUEUE_MAX_SIZE) 
+			FlushSendQueue();
 	}
 
 	DatagramSession::Info DatagramSession::GetSessionInfo() const
@@ -379,14 +381,6 @@ namespace datagram
 		if(ls && ls->GetExpirationTime() > oldExpire) m_RemoteLeaseSet = ls;
 	}
 
-	void DatagramSession::HandleSend(std::shared_ptr<I2NPMessage> msg)
-	{
-		if (msg || m_SendQueue.empty ())
-			m_SendQueue.push_back(msg);
-		// flush queue right away if full
-		if(!msg || m_SendQueue.size() >= DATAGRAM_SEND_QUEUE_MAX_SIZE) FlushSendQueue();
-	}
-
 	void DatagramSession::FlushSendQueue ()
 	{
 		if (m_SendQueue.empty ()) return;
diff --git a/libi2pd/Datagram.h b/libi2pd/Datagram.h
index 2aabcb1f..94fe422c 100644
--- a/libi2pd/Datagram.h
+++ b/libi2pd/Datagram.h
@@ -85,8 +85,6 @@ namespace datagram
 
 		private:
 
-			void HandleSend(std::shared_ptr<I2NPMessage> msg);
-
 			std::shared_ptr<i2p::garlic::GarlicRoutingPath> GetSharedRoutingPath();
 
 			void HandleLeaseSetUpdated(std::shared_ptr<i2p::data::LeaseSet> ls);
@@ -119,6 +117,7 @@ namespace datagram
 
 			void SendDatagramTo (const uint8_t * payload, size_t len, const i2p::data::IdentHash & ident, uint16_t fromPort = 0, uint16_t toPort = 0);
 			void SendRawDatagramTo (const uint8_t * payload, size_t len, const i2p::data::IdentHash & ident, uint16_t fromPort = 0, uint16_t toPort = 0);
+			// TODO: implement calls from other thread from SAM
 			
 			std::shared_ptr<DatagramSession> GetSession(const i2p::data::IdentHash & ident);
 			void SendDatagram (std::shared_ptr<DatagramSession> session, const uint8_t * payload, size_t len, uint16_t fromPort, uint16_t toPort);
@@ -168,6 +167,7 @@ namespace datagram
 			i2p::data::GzipInflator m_Inflator;
 			i2p::data::GzipDeflator m_Deflator;
 			std::vector<uint8_t> m_From, m_Signature;
+			i2p::util::MemoryPool<I2NPMessageBuffer<I2NP_MAX_MESSAGE_SIZE> > m_I2NPMsgsPool;
 	};
 }
 }