From 44ca315c7559f44190853b9aa3da88979e89fe2b Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Sun, 15 Nov 2020 19:38:34 -0500
Subject: [PATCH] don't build tunnels for all pools at the time

---
 libi2pd/Tunnel.cpp     | 28 ++++++++++++++++------------
 libi2pd/Tunnel.h       |  4 ++--
 libi2pd/TunnelPool.cpp | 15 +++++++++++++--
 libi2pd/TunnelPool.h   |  4 ++++
 4 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/libi2pd/Tunnel.cpp b/libi2pd/Tunnel.cpp
index a74c8c91..ad918787 100644
--- a/libi2pd/Tunnel.cpp
+++ b/libi2pd/Tunnel.cpp
@@ -474,7 +474,7 @@ namespace tunnel
 	{
 		std::this_thread::sleep_for (std::chrono::seconds(1)); // wait for other parts are ready
 
-		uint64_t lastTs = 0;
+		uint64_t lastTs = 0, lastPoolsTs = 0;
 		while (m_IsRunning)
 		{
 			try
@@ -535,12 +535,20 @@ namespace tunnel
 					while (msg);
 				}
 
-				uint64_t ts = i2p::util::GetSecondsSinceEpoch ();
-				if (ts - lastTs >= 15 && i2p::transport::transports.IsOnline()) // manage tunnels every 15 seconds
+				if (i2p::transport::transports.IsOnline())
 				{
-					ManageTunnels ();
-					lastTs = ts;
-				}
+					uint64_t ts = i2p::util::GetSecondsSinceEpoch ();
+					if (ts - lastTs >= 15) // manage tunnels every 15 seconds
+					{
+						ManageTunnels ();
+						lastTs = ts;
+					}
+					if (ts - lastPoolsTs >= 5) // manage pools every 5 seconds
+					{
+						ManageTunnelPools (ts);
+						lastPoolsTs = ts;
+					}	
+				}	
 			}
 			catch (std::exception& ex)
 			{
@@ -582,7 +590,6 @@ namespace tunnel
 		ManageInboundTunnels ();
 		ManageOutboundTunnels ();
 		ManageTransitTunnels ();
-		ManageTunnelPools ();
 	}
 
 	void Tunnels::ManagePendingTunnels ()
@@ -794,16 +801,13 @@ namespace tunnel
 		}
 	}
 
-	void Tunnels::ManageTunnelPools ()
+	void Tunnels::ManageTunnelPools (uint64_t ts)
 	{
 		std::unique_lock<std::mutex> l(m_PoolsMutex);
 		for (auto& pool : m_Pools)
 		{
 			if (pool && pool->IsActive ())
-			{
-				pool->CreateTunnels ();
-				pool->TestTunnels ();
-			}
+				pool->ManageTunnels (ts);
 		}
 	}
 
diff --git a/libi2pd/Tunnel.h b/libi2pd/Tunnel.h
index a50bc31a..37c5cddb 100644
--- a/libi2pd/Tunnel.h
+++ b/libi2pd/Tunnel.h
@@ -230,7 +230,7 @@ namespace tunnel
 			void ManagePendingTunnels ();
 			template<class PendingTunnels>
 			void ManagePendingTunnels (PendingTunnels& pendingTunnels);
-			void ManageTunnelPools ();
+			void ManageTunnelPools (uint64_t ts);
 
 			std::shared_ptr<ZeroHopsInboundTunnel> CreateZeroHopsInboundTunnel ();
 			std::shared_ptr<ZeroHopsOutboundTunnel> CreateZeroHopsOutboundTunnel ();
@@ -249,7 +249,7 @@ namespace tunnel
 			std::list<std::shared_ptr<TunnelPool>> m_Pools;
 			std::shared_ptr<TunnelPool> m_ExploratoryPool;
 			i2p::util::Queue<std::shared_ptr<I2NPMessage> > m_Queue;
-
+			
 			// some stats
 			int m_NumSuccesiveTunnelCreations, m_NumFailedTunnelCreations;
 
diff --git a/libi2pd/TunnelPool.cpp b/libi2pd/TunnelPool.cpp
index 909248ba..a44fc33d 100644
--- a/libi2pd/TunnelPool.cpp
+++ b/libi2pd/TunnelPool.cpp
@@ -26,9 +26,10 @@ namespace tunnel
 {
 	TunnelPool::TunnelPool (int numInboundHops, int numOutboundHops, int numInboundTunnels, int numOutboundTunnels):
 		m_NumInboundHops (numInboundHops), m_NumOutboundHops (numOutboundHops),
-		m_NumInboundTunnels (numInboundTunnels), m_NumOutboundTunnels (numOutboundTunnels), m_IsActive (true),
-		m_CustomPeerSelector(nullptr)
+		m_NumInboundTunnels (numInboundTunnels), m_NumOutboundTunnels (numOutboundTunnels),
+		m_IsActive (true), m_CustomPeerSelector(nullptr)
 	{
+		m_NextManageTime = i2p::util::GetSecondsSinceEpoch () + rand () % TUNNEL_POOL_MANAGE_INTERVAL;
 	}
 
 	TunnelPool::~TunnelPool ()
@@ -321,6 +322,16 @@ namespace tunnel
 		}
 	}
 
+	void TunnelPool::ManageTunnels (uint64_t ts)
+	{
+		if (ts > m_NextManageTime)
+		{	
+			CreateTunnels ();
+			TestTunnels ();
+			m_NextManageTime = ts + TUNNEL_POOL_MANAGE_INTERVAL + (rand () % TUNNEL_POOL_MANAGE_INTERVAL)/2;  
+		}	
+	}	
+		
 	void TunnelPool::ProcessGarlicMessage (std::shared_ptr<I2NPMessage> msg)
 	{
 		if (m_LocalDestination)
diff --git a/libi2pd/TunnelPool.h b/libi2pd/TunnelPool.h
index 04ff4ae7..d1024d04 100644
--- a/libi2pd/TunnelPool.h
+++ b/libi2pd/TunnelPool.h
@@ -27,6 +27,8 @@ namespace i2p
 {
 namespace tunnel
 {
+	const int TUNNEL_POOL_MANAGE_INTERVAL = 10; // in seconds
+	
 	class Tunnel;
 	class InboundTunnel;
 	class OutboundTunnel;
@@ -69,6 +71,7 @@ namespace tunnel
 			std::shared_ptr<InboundTunnel> GetNextInboundTunnel (std::shared_ptr<InboundTunnel> excluded = nullptr) const;
 			std::shared_ptr<OutboundTunnel> GetNewOutboundTunnel (std::shared_ptr<OutboundTunnel> old) const;
 			void TestTunnels ();
+			void ManageTunnels (uint64_t ts);
 			void ProcessGarlicMessage (std::shared_ptr<I2NPMessage> msg);
 			void ProcessDeliveryStatus (std::shared_ptr<I2NPMessage> msg);
 
@@ -123,6 +126,7 @@ namespace tunnel
 			mutable std::mutex m_TestsMutex;
 			std::map<uint32_t, std::pair<std::shared_ptr<OutboundTunnel>, std::shared_ptr<InboundTunnel> > > m_Tests;
 			bool m_IsActive;
+			uint64_t m_NextManageTime; // in seconds
 			std::mutex m_CustomPeerSelectorMutex;
 			ITunnelPeerSelector * m_CustomPeerSelector;