cec: fixed - don't keep the mutex locked in CCECProcessor::Initialise()

[deb_libcec.git] / src / lib / AdapterCommunication.cpp

diff --git a/src/lib/AdapterCommunication.cpp b/src/lib/AdapterCommunication.cpp
index df803f5c2f47f420b980bcab2ac026ee555d5e8c..faa15aa27100e2f1dcc32e9b86aafd047c999b53 100644 (file)
--- a/src/lib/AdapterCommunication.cpp
+++ b/src/lib/AdapterCommunication.cpp
@@ -33,17 +33,15 @@
 #include "AdapterCommunication.h"
 
 #include "CECProcessor.h"
-#include "platform/serialport.h"
-#include "util/StdString.h"
-#include "platform/timeutils.h"
+#include "platform/serialport/serialport.h"
 
 using namespace std;
 using namespace CEC;
+using namespace PLATFORM;
 
 CCECAdapterMessage::CCECAdapterMessage(const cec_command &command)
 {
   clear();
-  maxTries = command.retries + 1;
 
   //set ack polarity to high when transmitting to the broadcast address
   //set ack polarity low when transmitting to any other address
@@ -198,9 +196,9 @@ CStdString CCECAdapterMessage::ToString(void) const
     case MSGCODE_HIGH_ERROR:
     case MSGCODE_LOW_ERROR:
       {
-        int iLine      = (size() >= 3) ? (at(1) << 8) | at(2) : 0;
+        uint32_t iLine = (size() >= 3) ? (at(1) << 8) | at(2) : 0;
         uint32_t iTime = (size() >= 7) ? (at(3) << 24) | (at(4) << 16) | (at(5) << 8) | at(6) : 0;
-        strMsg.AppendFormat(" line:%i", iLine);
+        strMsg.AppendFormat(" line:%u", iLine);
         strMsg.AppendFormat(" time:%u", iTime);
       }
       break;
@@ -227,9 +225,9 @@ bool CCECAdapterMessage::is_error(void) const
     code == MSGCODE_LOW_ERROR ||
     code == MSGCODE_RECEIVE_FAILED ||
     code == MSGCODE_COMMAND_REJECTED ||
-    code ==  MSGCODE_TRANSMIT_LINE_TIMEOUT ||
+    code == MSGCODE_TRANSMIT_LINE_TIMEOUT ||
     code == MSGCODE_TRANSMIT_FAILED_LINE ||
-    code ==  MSGCODE_TRANSMIT_FAILED_ACK ||
+    code == MSGCODE_TRANSMIT_FAILED_ACK ||
     code == MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA ||
     code == MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE);
 }
@@ -250,7 +248,7 @@ CAdapterCommunication::CAdapterCommunication(CCECProcessor *processor) :
     m_processor(processor),
     m_iLineTimeout(0)
 {
-  m_port = new CSerialPort;
+  m_port = new PLATFORM::CSerialPort;
 }
 
 CAdapterCommunication::~CAdapterCommunication(void)
@@ -266,7 +264,11 @@ CAdapterCommunication::~CAdapterCommunication(void)
 
 bool CAdapterCommunication::Open(const char *strPort, uint16_t iBaudRate /* = 38400 */, uint32_t iTimeoutMs /* = 10000 */)
 {
-  CLockObject lock(&m_mutex);
+  uint64_t iNow = GetTimeMs();
+  uint64_t iTimeout = iNow + iTimeoutMs;
+
+  CLockObject lock(m_mutex);
+
   if (!m_port)
   {
     m_processor->AddLog(CEC_LOG_ERROR, "port is NULL");
@@ -276,12 +278,23 @@ bool CAdapterCommunication::Open(const char *strPort, uint16_t iBaudRate /* = 38
   if (IsOpen())
   {
     m_processor->AddLog(CEC_LOG_ERROR, "port is already open");
+    return true;
   }
 
-  if (!m_port->Open(strPort, iBaudRate))
+  CStdString strError;
+  bool bConnected(false);
+  while (!bConnected && iNow < iTimeout)
+  {
+    if ((bConnected = m_port->Open(strPort, iBaudRate)) == false)
+    {
+      strError.Format("error opening serial port '%s': %s", strPort, m_port->GetError().c_str());
+      Sleep(250);
+      iNow = GetTimeMs();
+    }
+  }
+
+  if (!bConnected)
   {
-    CStdString strError;
-    strError.Format("error opening serial port '%s': %s", strPort, m_port->GetError().c_str());
     m_processor->AddLog(CEC_LOG_ERROR, strError);
     return false;
   }
@@ -294,7 +307,7 @@ bool CAdapterCommunication::Open(const char *strPort, uint16_t iBaudRate /* = 38
 
   if (CreateThread())
   {
-    m_startCondition.Wait(&m_mutex);
+    m_startCondition.Wait(m_mutex);
     m_processor->AddLog(CEC_LOG_DEBUG, "communication thread started");
     return true;
   }
@@ -308,7 +321,7 @@ bool CAdapterCommunication::Open(const char *strPort, uint16_t iBaudRate /* = 38
 
 void CAdapterCommunication::Close(void)
 {
-  CLockObject lock(&m_mutex);
+  CLockObject lock(m_mutex);
   m_startCondition.Broadcast();
   m_rcvCondition.Broadcast();
   StopThread();
@@ -317,7 +330,7 @@ void CAdapterCommunication::Close(void)
 void *CAdapterCommunication::Process(void)
 {
   {
-    CLockObject lock(&m_mutex);
+    CLockObject lock(m_mutex);
     m_startCondition.Signal();
   }
 
@@ -328,6 +341,10 @@ void *CAdapterCommunication::Process(void)
     WriteNextCommand();
   }
 
+  CCECAdapterMessage *msg;
+  if (m_outBuffer.Pop(msg))
+    msg->condition.Broadcast();
+
   return NULL;
 }
 
@@ -354,8 +371,8 @@ bool CAdapterCommunication::ReadFromDevice(uint32_t iTimeout)
 
 void CAdapterCommunication::AddData(uint8_t *data, uint8_t iLen)
 {
-  CLockObject lock(&m_mutex);
-  for (unsigned int iPtr = 0; iPtr < iLen; iPtr++)
+  CLockObject lock(m_mutex);
+  for (uint8_t iPtr = 0; iPtr < iLen; iPtr++)
     m_inBuffer.Push(data[iPtr]);
 
   m_rcvCondition.Signal();
@@ -370,8 +387,8 @@ void CAdapterCommunication::WriteNextCommand(void)
 
 void CAdapterCommunication::SendMessageToAdapter(CCECAdapterMessage *msg)
 {
-  CLockObject lock(&msg->mutex);
-  if (m_port->Write(msg) != (int32_t) msg->size())
+  CLockObject lock(msg->mutex);
+  if (m_port->Write(msg->packet.data, msg->size()) != (int32_t) msg->size())
   {
     CStdString strError;
     strError.Format("error writing to serial port: %s", m_port->GetError().c_str());
@@ -395,7 +412,7 @@ bool CAdapterCommunication::Write(CCECAdapterMessage *data)
 
 bool CAdapterCommunication::Read(CCECAdapterMessage &msg, uint32_t iTimeout)
 {
-  CLockObject lock(&m_mutex);
+  CLockObject lock(m_mutex);
 
   msg.clear();
   uint64_t iNow = GetTimeMs();
@@ -409,7 +426,7 @@ bool CAdapterCommunication::Read(CCECAdapterMessage &msg, uint32_t iTimeout)
     uint8_t buf = 0;
     if (!m_inBuffer.Pop(buf))
     {
-      if (!m_rcvCondition.Wait(&m_mutex, (uint32_t) (iTarget - iNow)))
+      if (!m_rcvCondition.Wait(m_mutex, (uint32_t) (iTarget - iNow)))
         return false;
     }
 
@@ -466,9 +483,9 @@ bool CAdapterCommunication::StartBootloader(void)
   output->push_escaped(MSGCODE_START_BOOTLOADER);
   output->push_back(MSGEND);
 
-  CLockObject lock(&output->mutex);
+  CLockObject lock(output->mutex);
   if (Write(output))
-    output->condition.Wait(&output->mutex);
+    output->condition.Wait(output->mutex);
   bReturn = output->state == ADAPTER_MESSAGE_STATE_SENT;
   delete output;
 
@@ -488,9 +505,9 @@ bool CAdapterCommunication::PingAdapter(void)
   output->push_escaped(MSGCODE_PING);
   output->push_back(MSGEND);
 
-  CLockObject lock(&output->mutex);
+  CLockObject lock(output->mutex);
   if (Write(output))
-    output->condition.Wait(&output->mutex);
+    output->condition.Wait(output->mutex);
   bReturn = output->state == ADAPTER_MESSAGE_STATE_SENT;
   delete output;
 
@@ -518,7 +535,7 @@ bool CAdapterCommunication::SetLineTimeout(uint8_t iTimeout)
   return bReturn;
 }
 
-bool CAdapterCommunication::IsOpen(void) const
+bool CAdapterCommunication::IsOpen(void)
 {
   return !IsStopped() && m_port->IsOpen() && IsRunning();
 }