Changeset 243 in flair-src

Timestamp:

May 24, 2018, 9:46:08 AM (7 years ago)

Author:

Sanahuja Guillaume

Message:

resolve some bugs when closing connection with gcs

Location:

trunk/lib

Files:

• FlairCore/src/FrameworkManager_impl.cpp (modified) (2 diffs)
• FlairCore/src/Thread_impl.cpp (modified) (3 diffs)
• FlairCore/src/ui_com.cpp (modified) (2 diffs)
• FlairSensorActuator/src/HostEthController.cpp (modified) (1 diff)

trunk/lib/FlairCore/src/FrameworkManager_impl.cpp

@@ -189 +189 @@
   if (com != NULL) {
     delete com;
+    //avoid waiting on closing if connection is lost
+    if(connection_lost) {
+      bool blocking = false;
+      if (UDT::setsockopt(com_sock, 0, UDT_SNDSYN, &blocking, sizeof(bool)) != 0)
+        Err("UDT::setsockopt error (UDT_SNDSYN)\n");
+    }
     status = UDT::close(com_sock);
     if (status != 0)
@@ -194 +200 @@
 
     SleepMS(200); // a revoir, sinon UDT::cleanup bloque en RT
-    UDT::cleanup();
+    
+    if(connection_lost) {
+      //don't know why?
+     Warn("Cleaning up UDT socket, this can take some time\n");
+    }
+    if (UDT::cleanup() != 0)
+        Err("UDT::cleanup error\n");
   }
 

trunk/lib/FlairCore/src/Thread_impl.cpp

@@ -149 +149 @@
 
   caller->self->Run();
-
+  Printf("Stopping thread %s\n", caller->self->ObjectName().c_str()); 
   caller->PrintStats();
 }
@@ -160 +160 @@
 
   caller->self->Run();
-
+  Printf("Stopping thread %s\n", caller->self->ObjectName().c_str()); 
   caller->PrintStats();
 
@@ -316 +316 @@
 
 void Thread_impl::PrintStats(void) {
-  Printf("Stopping thread %s\n", self->ObjectName().c_str()); 
 #ifdef __XENO__
   RT_TASK_INFO info;

trunk/lib/FlairCore/src/ui_com.cpp

@@ -118 +118 @@
 
 ui_com::~ui_com() {
-// printf("destruction ui_com\n");
+//Printf("destruction ui_com\n");
 
 #ifdef __XENO__
@@ -143 +143 @@
   send_buffer = NULL;
 
-  // printf("destruction ui_com ok\n");
+  //Printf("destruction ui_com ok\n");
 }
 

trunk/lib/FlairSensorActuator/src/HostEthController.cpp

@@ -73 +73 @@
 
 HostEthController::~HostEthController() {
+  dataSender->SafeStop();
+  dataSender->Join();
   SafeStop();
   Join();