From: Lars Op den Kamp Date: Wed, 11 Apr 2012 15:04:16 +0000 (+0200) Subject: cec: moved the timed ping to a separate thread. bugzid: 654 X-Git-Tag: upstream/2.2.0~1^2~31^2~9 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=56e53c14cf072c449743fa36f2f80318cd64bfc3;p=deb_libcec.git cec: moved the timed ping to a separate thread. bugzid: 654 --- diff --git a/src/lib/adapter/USBCECAdapterCommunication.cpp b/src/lib/adapter/USBCECAdapterCommunication.cpp index fb6f267..ab26d84 100644 --- a/src/lib/adapter/USBCECAdapterCommunication.cpp +++ b/src/lib/adapter/USBCECAdapterCommunication.cpp @@ -51,7 +51,8 @@ CUSBCECAdapterCommunication::CUSBCECAdapterCommunication(CCECProcessor *processo m_lastDestination(CECDEVICE_UNKNOWN), m_bNextIsEscaped(false), m_bGotStart(false), - m_bInitialised(false) + m_bInitialised(false), + m_pingThread(NULL) { for (unsigned int iPtr = 0; iPtr < 15; iPtr++) m_bWaitingForAck[iPtr] = false; @@ -187,7 +188,8 @@ bool CUSBCECAdapterCommunication::Open(IAdapterCommunicationCallback *cb, uint32 } else if (bStartListening) { - if (CreateThread()) + m_pingThread = new CAdapterPingThread(this, CEC_ADAPTER_PING_TIMEOUT); + if (CreateThread() && m_pingThread->CreateThread()) { CLibCEC::AddLog(CEC_LOG_DEBUG, "communication thread started"); return true; @@ -211,6 +213,10 @@ bool CUSBCECAdapterCommunication::Open(IAdapterCommunicationCallback *cb, uint32 void CUSBCECAdapterCommunication::Close(void) { + if (m_pingThread) + m_pingThread->StopThread(0); + delete m_pingThread; + m_pingThread = NULL; StopThread(0); } @@ -219,7 +225,6 @@ void *CUSBCECAdapterCommunication::Process(void) cec_command command; command.Clear(); bool bCommandReceived(false); - CTimeout pingTimeout(CEC_ADAPTER_PING_TIMEOUT); while (!IsStopped()) { { @@ -232,12 +237,7 @@ void *CUSBCECAdapterCommunication::Process(void) if (!IsStopped() && bCommandReceived) m_callback->OnCommandReceived(command); - /* ping the adapter every 15 seconds */ - if (pingTimeout.TimeLeft() == 0) - { - pingTimeout.Init(CEC_ADAPTER_PING_TIMEOUT); - PingAdapter(); - } + Sleep(5); } /* set the ackmask to 0 before closing the connection */ @@ -297,7 +297,6 @@ bool CUSBCECAdapterCommunication::Write(CCECAdapterMessage *data) { data->state = ADAPTER_MESSAGE_STATE_WAITING_TO_BE_SENT; SendMessageToAdapter(data); - data->event.Wait(5000); if ((data->expectControllerAck && data->state != ADAPTER_MESSAGE_STATE_SENT_ACKED) || (!data->expectControllerAck && data->state != ADAPTER_MESSAGE_STATE_SENT)) @@ -373,7 +372,6 @@ bool CUSBCECAdapterCommunication::StartBootloader(void) bool CUSBCECAdapterCommunication::PingAdapter(void) { - CLockObject lock(m_mutex); CLibCEC::AddLog(CEC_LOG_DEBUG, "sending ping"); CCECAdapterMessage params; @@ -951,7 +949,6 @@ void CUSBCECAdapterCommunication::SendMessageToAdapter(CCECAdapterMessage *msg) CLibCEC::AddLog(CEC_LOG_DEBUG, "did not receive ack"); } } - msg->event.Signal(); } CStdString CUSBCECAdapterCommunication::GetPortName(void) @@ -1030,3 +1027,18 @@ cec_datapacket CUSBCECAdapterCommunication::GetSetting(cec_adapter_messagecode m return retVal; } + +void *CAdapterPingThread::Process(void) +{ + while (!IsStopped()) + { + if (m_timeout.TimeLeft() == 0) + { + m_timeout.Init(CEC_ADAPTER_PING_TIMEOUT); + m_com->PingAdapter(); + } + + Sleep(500); + } + return NULL; +} diff --git a/src/lib/adapter/USBCECAdapterCommunication.h b/src/lib/adapter/USBCECAdapterCommunication.h index 7305704..4ca8e87 100644 --- a/src/lib/adapter/USBCECAdapterCommunication.h +++ b/src/lib/adapter/USBCECAdapterCommunication.h @@ -45,6 +45,7 @@ namespace PLATFORM namespace CEC { class CCECProcessor; + class CAdapterPingThread; class CUSBCECAdapterCommunication : public IAdapterCommunication, private PLATFORM::CThread { @@ -126,5 +127,20 @@ namespace CEC IAdapterCommunicationCallback * m_callback; bool m_bInitialised; bool m_bWaitingForAck[15]; + CAdapterPingThread * m_pingThread; + }; + + class CAdapterPingThread : public PLATFORM::CThread + { + public: + CAdapterPingThread(CUSBCECAdapterCommunication *com, uint32_t iTimeout) : + m_com(com), + m_timeout(iTimeout){} + virtual ~CAdapterPingThread(void) {} + + virtual void* Process(void); + private: + CUSBCECAdapterCommunication *m_com; + PLATFORM::CTimeout m_timeout; }; };