Changeset 230 in flair-src for trunk/lib

Timestamp:

03/12/18 16:32:00 (6 years ago)

Author:

Sanahuja Guillaume

Message:

modifs timeout tcpsocket

Location:

trunk/lib

Files:

• FlairCore/src/TcpSocket.cpp (modified) (3 diffs)
• FlairSensorActuator/src/HostEthController.cpp (modified) (1 diff)
• FlairSensorActuator/src/SimuUs.cpp (modified) (1 diff)

trunk/lib/FlairCore/src/TcpSocket.cpp

@@ -139 +139 @@
       // now block with a timeout
       struct timeval tv;
-      if (timeout != 0) {
-        tv.tv_sec = timeout / 1000; // timeout is in ms
-        tv.tv_usec = (timeout % 1000) * 1000;
+      if (timeout != 0) {// timeout is in ns
+        tv.tv_sec = timeout /((Time)1000000000); 
+        tv.tv_usec = (timeout%((Time)1000000000))/1000;
+        Printf("%i %i\n",tv.tv_sec,tv.tv_usec);
       }
       fd_set wset;
@@ -190 +191 @@
   if (!success) {
     close(socket);
-    // Info("Debug: Connect to %s:%d failed\n", distantAddress.c_str(),
-    // distantPort);
+     //Info("Debug: Connect to %s:%d failed\n", distantAddress.c_str(), distantPort);
     return false;
   } else {
@@ -197 +197 @@
     this->distantPort = distantPort;
     this->distantAddress = distantAddress;
-    // Info("Debug: Connect to %s:%d succeeded\n", distantAddress.c_str(),
-    // distantPort);
+     //Info("Debug: Connect to %s:%d succeeded\n", distantAddress.c_str(), distantPort);
     return true;
   }

trunk/lib/FlairSensorActuator/src/HostEthController.cpp

@@ -149 +149 @@
   connectionEstablishedMutex->GetMutex();
   if (!connectionEstablished &&
-      controlSocket->Connect(targetPort, targetAddress, 10)) {
+      controlSocket->Connect(targetPort, targetAddress, 100000000)) {//100ms
     Thread::Info("Connected to %s:%d\n", targetAddress.c_str(), targetPort);
     SendControllerInfo();

trunk/lib/FlairSensorActuator/src/SimuUs.cpp

@@ -31 +31 @@
 namespace sensor {
 
-//control part
 SimuUs::SimuUs(string name, uint32_t modelId,uint32_t deviceId,
                uint8_t priority)