Changeset 238 in flair-src for trunk/lib/FlairSensorActuator/src/TargetEthController.cpp

Timestamp:

May 15, 2018, 4:41:02 PM (7 years ago)

Author:

Bayard Gildas

Message:

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

File:

• trunk/lib/FlairSensorActuator/src/TargetEthController.cpp (modified) (11 diffs)

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) {