Changeset 238 in flair-src for trunk/lib/FlairSensorActuator

Timestamp:

05/15/18 16:41:02 (6 years ago)

Author:

Bayard Gildas

Message:

correction sémaphore. bloquant tout ça...

Location:

trunk/lib/FlairSensorActuator/src

Files:

• HostEthController.cpp (modified) (4 diffs)
• HostEthController.h (modified) (3 diffs)
• SimuCamera.cpp (modified) (1 diff)
• TargetEthController.cpp (modified) (11 diffs)

trunk/lib/FlairSensorActuator/src/HostEthController.cpp

@@ -142 +142 @@
 }
 
-bool HostEthController::ConnectedWithTarget() {
+bool HostEthController::ConnectWithTarget() {
   char message[1024];
   ssize_t sent, received;
@@ -181 +181 @@
       GetButtonData();
 
-      if (ConnectedWithTarget()) {
+      if (ConnectWithTarget()) {
         // read for commands from the target (remote control state change
         // requests such as rumble or led on/off)
@@ -201 +201 @@
       }
     } else { // try to connect even if host is not sending anything
-      ConnectedWithTarget();
+      ConnectWithTarget();
     }
     // Thread::Info("Debug: exiting acquisition loop\n");
@@ -291 +291 @@
     WaitPeriod();
     if (hostEthController->meaningfulDataAvailable &&
-        hostEthController->ConnectedWithTarget()) {
+        hostEthController->ConnectWithTarget()) {
       // send the data
       hostEthController->BuildDataFrame();

trunk/lib/FlairSensorActuator/src/HostEthController.h

@@ -25 +25 @@
 
 namespace flair {
-namespace core {
-class Matrix;
-class TcpSocket;
-class UdpSocket;
-class Mutex;
-}
-namespace gui {
-class Tab;
-class TabWidget;
-class DataPlot1D;
-}
+  namespace core {
+    class Matrix;
+    class TcpSocket;
+    class UdpSocket;
+    class Mutex;
+  }
+  namespace gui {
+    class Tab;
+    class TabWidget;
+    class DataPlot1D;
+  }
 }
 
@@ -47 +47 @@
 *through ethernet connection
 *
-* There are 2 communication channels:
+* There are 3 communication channels:
 *   - 1 connection with the ground station to display the values. Output for
-*analog sticks is normalized in the range [-1, 1] (float values)
-*   - 1 connection with the target to send the controller values (and receive
-*controller state modification requests)
+*analog sticks is normalized in the range [-1, 1] (float values) (through DrawUserInterface, use a UDT socket)
+*   - 1 connection with the target to send the controller values (through udp socket - high bandwitdh, packets may be discarded)
+*   - 1 connection with the target to receive controller state modification requests (through tcp socket - low bandwidth, packets must not be discarded)
 */
 class HostEthController : public core::Thread, public core::IODevice {
@@ -107 +107 @@
 
   bool ControllerInitialization();
-  bool ConnectedWithTarget();
+  bool ConnectWithTarget();
   void SendControllerInfo();
   void Run();

trunk/lib/FlairSensorActuator/src/SimuCamera.cpp

@@ -80 +80 @@
     output->GetMutex();
     //blocking read
-    shmem->Read(shmemReadBuf, buf_size); // remplacer copie par
-                                                   // échange de pointeur sur
-                                                   // double buffering
-                                            
-    output->ReleaseMutex();
-    memcpy(&time,shmemReadBuf+buf_size-sizeof(Time),sizeof(Time));
-    output->SetDataTime(time);
+    if (shmem->Read(shmemReadBuf, buf_size, 1000000000)) { // remplacer copie par
+      // échange de pointeur sur
+      // double buffering
 
-    ProcessUpdate(output);
+      output->ReleaseMutex();
+      memcpy(&time, shmemReadBuf + buf_size - sizeof(Time), sizeof(Time));
+      output->SetDataTime(time);
+
+      ProcessUpdate(output);
+    } else {
+      output->ReleaseMutex();
+      Thread::Warn("Read Timeout\n");
+    }
   }
 }

trunk/lib/FlairSensorActuator/src/TargetEthController.cpp

@@ -59 +59 @@
     // socket to be closed by the client
     controlSocket->RecvMessage(msg.buffer, msg.bufferSize);
+    delete controlSocket;
   }
 
@@ -65 +66 @@
   SafeStop();
   Join();
+  delete dataSocket;
+  delete listeningSocket;
 }
 
@@ -202 +205 @@
 
 bool TargetEthController::ProcessMessage(Message *msg) {
-  return !(controlSocket->SendMessage(msg->buffer, msg->bufferSize, 0) < 0);
+  return !(controlSocket->SendMessage(msg->buffer, msg->bufferSize, TIME_INFINITE) < 0);
 }
 
@@ -234 +237 @@
   bool connectionAccepted = false;
   while (!connectionAccepted) {
-    controlSocket = listeningSocket->Accept(10);
-    if (controlSocket == nullptr) {
-      // Timeout (or error btw)
+    try {
+      controlSocket = listeningSocket->Accept(100000000);
+    } catch (std::logic_error &e) {
+      Thread::Err(e.what());
+      return false;
+    } catch (std::runtime_error e) {
+      // timeout
       if (ToBeStopped())
         return false;
+    }
+    if (controlSocket == nullptr) {
+      return false;
     } else
       connectionAccepted = true;
@@ -248 +258 @@
   while (!axisNumberRead) {
     try {
-      axisNumber = controlSocket->ReadUInt32(10);
+      axisNumber = controlSocket->ReadUInt32(100000000);
       // Thread::Info("Debug: axisNumber %d\n", axisNumber);
       axisNumberRead = true;
@@ -260 +270 @@
   while (!bitsPerAxisRead) {
     try {
-      bitsPerAxis = controlSocket->ReadUInt32(10);
+      bitsPerAxis = controlSocket->ReadUInt32(100000000);
       // Thread::Info("Debug: bits per axis %d\n", bitsPerAxis);
       bitsPerAxisRead = true;
@@ -276 +286 @@
     while (!stringSizeRead) {
       try {
-        stringSize = controlSocket->ReadUInt32(10);
+        stringSize = controlSocket->ReadUInt32(100000000);
         stringSizeRead = true;
       } catch (std::runtime_error e) {
@@ -288 +298 @@
     while (!axisNameRead) {
       try {
-        axisName[i] = controlSocket->ReadString(stringSize, 10);
+        axisName[i] = controlSocket->ReadString(stringSize, 100000000);
         axisNameRead = true;
       } catch (std::runtime_error e) {
@@ -303 +313 @@
   while (!buttonNumberRead) {
     try {
-      buttonNumber = controlSocket->ReadUInt32(10);
+      buttonNumber = controlSocket->ReadUInt32(100000000);
       buttonNumberRead = true;
     } catch (std::runtime_error e) {
@@ -319 +329 @@
     while (!stringSizeRead) {
       try {
-        stringSize = controlSocket->ReadUInt32(10);
+        stringSize = controlSocket->ReadUInt32(100000000);
         stringSizeRead = true;
       } catch (std::runtime_error e) {
@@ -331 +341 @@
     while (!buttonNameRead) {
       try {
-        buttonName[i] = controlSocket->ReadString(stringSize, 10);
+        buttonName[i] = controlSocket->ReadString(stringSize, 10000000);
         buttonNameRead = true;
       } catch (std::runtime_error e) {