ambed up on std::future

ambed/ccontroller.cpp

@@ -34,8 +34,7 @@
 
 CController::CController()
 {
-	m_bStopThread = false;
+	keep_running = true;
-	m_pThread = NULL;
 	m_uiLastStreamId = 0;
 }
 
@@ -59,12 +58,8 @@ CController::~CController()
 	}
 
 	m_Mutex.unlock();
-	m_bStopThread = true;
+	keep_running = false;
-	if ( m_pThread != NULL )
+	Close();
-	{
-		m_pThread->join();
-		delete m_pThread;
-	}
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -73,7 +68,7 @@ CController::~CController()
 bool CController::Init(void)
 {
 	// reset stop flag
-	m_bStopThread = false;
+	keep_running = true;
 
 	// create our socket
 	CIp ip(strchr(m_addr, ':') ? AF_INET6 : AF_INET, TRANSCODER_PORT, m_addr);
@@ -88,30 +83,17 @@ bool CController::Init(void)
 		return false;
 	}
 	// start  thread;
-	m_pThread = new std::thread(CController::Thread, this);
+	m_Future = std::async(std::launch::async, &CController::Task, this);
 
 	return true;
 }
 
 void CController::Close(void)
 {
-	m_bStopThread = true;
+	keep_running = false;
-	if ( m_pThread != NULL )
+	if (m_Future.valid() )
-	{
-		m_pThread->join();
-		delete m_pThread;
-		m_pThread = NULL;
-	}
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-// thread
-
-void CController::Thread(CController *This)
-{
-	while ( !This->m_bStopThread )
 	{
-		This->Task();
+		m_Future.get();
 	}
 }
 
@@ -120,6 +102,7 @@ void CController::Thread(CController *This)
 
 void CController::Task(void)
 {
+	while (keep_running) {
 		CBuffer     Buffer;
 		CIp         Ip;
 		CCallsign   Callsign;
@@ -165,6 +148,7 @@ void CController::Task(void)
 				m_Socket.Send(Buffer, Ip);
 			}
 		}
+	}
 
 	// any inactive streams?
 	Lock();

ambed/ccontroller.h

@@ -56,7 +56,6 @@ public:
 	void SetListenIp(const char *str)   { memset(m_addr, 0, INET6_ADDRSTRLEN); strncpy(m_addr, str, INET6_ADDRSTRLEN-1); }
 
 	// task
-	static void Thread(CController *);
 	void Task(void);
 
 protected:
@@ -88,8 +87,8 @@ protected:
 	std::list<CStream *> m_Streams;
 
 	// thread
-	bool         m_bStopThread;
+	std::atomic<bool> keep_running;
-	std::thread *m_pThread;
+	std::future<void> m_Future;
 
 };
 

ambed/cstream.cpp

@@ -43,8 +43,7 @@ CStream::CStream()
 {
 	m_uiId = 0;
 	m_uiPort = 0;
-	m_bStopThread = false;
+	keep_running = true;
-	m_pThread = NULL;
 	m_VocodecChannel = NULL;
 	m_LastActivity.Now();
 	m_iTotalPackets = 0;
@@ -59,8 +58,7 @@ CStream::CStream(uint16 uiId, const CCallsign &Callsign, const CIp &Ip, uint8 ui
 	m_uiPort = 0;
 	m_uiCodecIn = uiCodecIn;
 	m_uiCodecOut = uiCodecOut;
-	m_bStopThread = false;
+	keep_running = true;
-	m_pThread = NULL;
 	m_VocodecChannel = NULL;
 	m_LastActivity.Now();
 	m_iTotalPackets = 0;
@@ -73,12 +71,10 @@ CStream::CStream(uint16 uiId, const CCallsign &Callsign, const CIp &Ip, uint8 ui
 CStream::~CStream()
 {
 	// stop thread first
-	m_bStopThread = true;
+	keep_running = false;
-	if ( m_pThread != NULL )
+	if ( m_Future.valid() )
 	{
-		m_pThread->join();
+		m_Future.get();
-		delete m_pThread;
-		m_pThread = NULL;
 	}
 
 	// then close everything
@@ -95,7 +91,7 @@ CStream::~CStream()
 bool CStream::Init(uint16 uiPort)
 {
 	// reset stop flag
-	m_bStopThread = false;
+	keep_running = true;
 
 	// create our socket
 	auto s = g_AmbeServer.GetListenIp();
@@ -125,7 +121,7 @@ bool CStream::Init(uint16 uiPort)
 	m_uiPort = uiPort;
 
 	// start  thread;
-	m_pThread = new std::thread(CStream::Thread, this);
+	m_Future = std::async(std::launch::async, &CStream::Task, this);
 
 	// init timeout system
 	m_LastActivity.Now();
@@ -141,12 +137,10 @@ bool CStream::Init(uint16 uiPort)
 void CStream::Close(void)
 {
 	// stop thread first
-	m_bStopThread = true;
+	keep_running = false;
-	if ( m_pThread != NULL )
+	if ( m_Future.valid() )
 	{
-		m_pThread->join();
+		m_Future.get();
-		delete m_pThread;
-		m_pThread = NULL;
 	}
 
 	// then close everything
@@ -161,22 +155,12 @@ void CStream::Close(void)
 	std::cout << m_iLostPackets << " of " << m_iTotalPackets << " packets lost" << std::endl;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////
-// thread
-
-void CStream::Thread(CStream *This)
-{
-	while ( !This->m_bStopThread )
-	{
-		This->Task();
-	}
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////
 // task
 
 void CStream::Task(void)
 {
+	while (keep_running) {
 		CBuffer     Buffer;
 		static CIp  Ip;
 		uint8       uiPid;
@@ -217,6 +201,7 @@ void CStream::Task(void)
 		}
 		m_VocodecChannel->ReleasePacketQueueOut();
 	}
+}
 
 ////////////////////////////////////////////////////////////////////////////////////////
 // packet decoding helpers

ambed/cstream.h

@@ -56,7 +56,6 @@ public:
 	bool    IsActive(void) const        { return m_LastActivity.DurationSinceNow() <= STREAM_ACTIVITY_TIMEOUT; }
 
 	// task
-	static void Thread(CStream *);
 	void Task(void);
 
 protected:
@@ -88,8 +87,8 @@ protected:
 	CTimePoint      m_LastActivity;
 
 	// thread
-	bool            m_bStopThread;
+	std::atomic<bool> keep_running;
-	std::thread     *m_pThread;
+	std::future<void> m_Future;
 
 };
 

ambed/cvocodecinterface.cpp

@@ -34,8 +34,7 @@
 CVocodecInterface::CVocodecInterface()
 {
 	m_Channels.reserve(5);
-	m_bStopThread = false;
+	keep_running = true;
-	m_pThread = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -48,11 +47,10 @@ CVocodecInterface::~CVocodecInterface()
 	m_Channels.clear();
 
 	// stop thread
-	m_bStopThread = true;
+	keep_running = false;
-	if ( m_pThread != NULL )
+	if ( m_Future.valid() )
 	{
-		m_pThread->join();
+		m_Future.get();
-		delete m_pThread;
 	}
 }
 
@@ -62,10 +60,10 @@ CVocodecInterface::~CVocodecInterface()
 bool CVocodecInterface::Init(void)
 {
 	// reset stop flag
-	m_bStopThread = false;
+	keep_running = true;
 
 	// start  thread;
-	m_pThread = new std::thread(CVocodecInterface::Thread, this);
+	m_Future = std::async(std::launch::async, &CVocodecInterface::Thread, this);
 
 	// done
 	return true;
@@ -75,11 +73,11 @@ bool CVocodecInterface::Init(void)
 ////////////////////////////////////////////////////////////////////////////////////////
 // thread
 
-void CVocodecInterface::Thread(CVocodecInterface *This)
+void CVocodecInterface::Thread()
 {
-	while ( !This->m_bStopThread )
+	while ( keep_running )
 	{
-		This->Task();
+		Task();
 	}
 }
 
@@ -91,5 +89,3 @@ void CVocodecInterface::AddChannel(CVocodecChannel *Channel)
 {
 	m_Channels.push_back(Channel);
 }
-
-

ambed/cvocodecinterface.h

@@ -55,8 +55,8 @@ public:
 	virtual CVocodecChannel *GetChannelWithChannelOut(int)      { return NULL; }
 
 	// task
-	static void Thread(CVocodecInterface *);
+	void Thread(void);
-	virtual void Task(void) {};
+	virtual void Task(void) {}
 
 	// operators
 	virtual bool operator ==(const CVocodecInterface &) const   { return false; }
@@ -66,8 +66,8 @@ protected:
 	std::vector<CVocodecChannel *>  m_Channels;
 
 	// thread
-	bool                            m_bStopThread;
+	std::atomic<bool> keep_running;
-	std::thread                     *m_pThread;
+	std::future<void> m_Future;
 
 };
 

ambed/main.h

@@ -31,7 +31,8 @@
 #include <map>
 #include <queue>
 #include <chrono>
-#include <thread>
+#include <future>
+#include <atomic>
 #include <mutex>
 #include <atomic>
 #include <condition_variable>