Browse Source

fixed race condition

pull/134/head
orignal 10 years ago
parent
commit
41974b8c75
  1. 52
      Destination.cpp
  2. 2
      Destination.h

52
Destination.cpp

@ -85,34 +85,40 @@ namespace client @@ -85,34 +85,40 @@ namespace client
void ClientDestination::Start ()
{
m_Pool->SetLocalDestination (this);
m_Pool->SetActive (true);
m_IsRunning = true;
m_Thread = new std::thread (std::bind (&ClientDestination::Run, this));
m_StreamingDestination->Start ();
if (!m_IsRunning)
{
m_IsRunning = true;
m_Pool->SetLocalDestination (this);
m_Pool->SetActive (true);
m_Thread = new std::thread (std::bind (&ClientDestination::Run, this));
m_StreamingDestination->Start ();
}
}
void ClientDestination::Stop ()
{
m_StreamingDestination->Stop ();
if (m_DatagramDestination)
{
auto d = m_DatagramDestination;
m_DatagramDestination = nullptr;
delete d;
}
if (m_Pool)
{
m_Pool->SetLocalDestination (nullptr);
i2p::tunnel::tunnels.StopTunnelPool (m_Pool);
}
m_IsRunning = false;
m_Service.stop ();
if (m_Thread)
if (m_IsRunning)
{
m_Thread->join ();
delete m_Thread;
m_Thread = 0;
m_IsRunning = false;
m_StreamingDestination->Stop ();
if (m_DatagramDestination)
{
auto d = m_DatagramDestination;
m_DatagramDestination = nullptr;
delete d;
}
if (m_Pool)
{
m_Pool->SetLocalDestination (nullptr);
i2p::tunnel::tunnels.StopTunnelPool (m_Pool);
}
m_Service.stop ();
if (m_Thread)
{
m_Thread->join ();
delete m_Thread;
m_Thread = 0;
}
}
}

2
Destination.h

@ -112,7 +112,7 @@ namespace client @@ -112,7 +112,7 @@ namespace client
private:
bool m_IsRunning;
volatile bool m_IsRunning;
std::thread * m_Thread;
boost::asio::io_service m_Service;
boost::asio::io_service::work m_Work;

Loading…
Cancel
Save