Browse Source

don't block tunnel list for a long time

pull/102/head
orignal 10 years ago
parent
commit
c047544cdb
  1. 8
      Tunnel.cpp

8
Tunnel.cpp

@ -412,7 +412,6 @@ namespace tunnel
{ {
uint64_t ts = i2p::util::GetSecondsSinceEpoch (); uint64_t ts = i2p::util::GetSecondsSinceEpoch ();
{ {
std::unique_lock<std::mutex> l(m_OutboundTunnelsMutex);
for (auto it = m_OutboundTunnels.begin (); it != m_OutboundTunnels.end ();) for (auto it = m_OutboundTunnels.begin (); it != m_OutboundTunnels.end ();)
{ {
auto tunnel = *it; auto tunnel = *it;
@ -422,7 +421,10 @@ namespace tunnel
auto pool = tunnel->GetTunnelPool (); auto pool = tunnel->GetTunnelPool ();
if (pool) if (pool)
pool->TunnelExpired (tunnel); pool->TunnelExpired (tunnel);
{
std::unique_lock<std::mutex> l(m_OutboundTunnelsMutex);
it = m_OutboundTunnels.erase (it); it = m_OutboundTunnels.erase (it);
}
delete tunnel; delete tunnel;
} }
else else
@ -453,7 +455,6 @@ namespace tunnel
{ {
uint64_t ts = i2p::util::GetSecondsSinceEpoch (); uint64_t ts = i2p::util::GetSecondsSinceEpoch ();
{ {
std::unique_lock<std::mutex> l(m_InboundTunnelsMutex);
for (auto it = m_InboundTunnels.begin (); it != m_InboundTunnels.end ();) for (auto it = m_InboundTunnels.begin (); it != m_InboundTunnels.end ();)
{ {
auto tunnel = it->second; auto tunnel = it->second;
@ -463,7 +464,10 @@ namespace tunnel
auto pool = tunnel->GetTunnelPool (); auto pool = tunnel->GetTunnelPool ();
if (pool) if (pool)
pool->TunnelExpired (tunnel); pool->TunnelExpired (tunnel);
{
std::unique_lock<std::mutex> l(m_InboundTunnelsMutex);
it = m_InboundTunnels.erase (it); it = m_InboundTunnels.erase (it);
}
delete tunnel; delete tunnel;
} }
else else

Loading…
Cancel
Save