Changeset 20 in flair-src for trunk

Timestamp:

04/12/16 16:26:41 (8 years ago)

Author:

Sanahuja Guillaume

Message:

correction bug recpetion log et watchdog

Location:

trunk

Files:

• lib/FlairCore/src/FrameworkManager_impl.cpp (modified) (5 diffs)
• lib/FlairCore/src/Thread_impl.cpp (modified) (1 diff)
• tools/FlairGCS/src/UdtSocket.cpp (modified) (1 diff)

trunk/lib/FlairCore/src/FrameworkManager_impl.cpp

@@ -101 +101 @@
   ui_defined = false;
   rcv_buf = NULL;
+  gcs_watchdog = NULL;
   _this = this;
 
@@ -215 +216 @@
   UDT::setsockopt(file_sock, 0, UDT_RCVSYN, &blocking, sizeof(bool));
 
-  // configure timeout of blocking receive, short timeout to have priority on
-  // the other socket (see run method)
-  int timeout = 1; // ms
-  UDT::setsockopt(file_sock, 0, UDT_RCVTIMEO, &timeout, sizeof(int));
-
-  timeout = 100; // ms
+  int timeout = 100; // ms
   UDT::setsockopt(com_sock, 0, UDT_RCVTIMEO, &timeout, sizeof(int));
 
@@ -453 +449 @@
     Err("UDT::sendmsg error, sent %i/%i\n", nb_write, 1);
   }
+
+    //wait end ACK
+    int nb_read = UDT::recvmsg(file_sock,&buf,1);
+    if(nb_read<0) {
+    Err("UDT::recvmsg error (%s)\n",UDT::getlasterror().getErrorMessage());
+    } else if (nb_read != 1)  {
+    Err("UDT::recvmsg error, sent %i/%i\n",nb_read,1);
+    }
 }
 
@@ -813 +817 @@
         } else // stop logging
         {
+            //disable watchdog temporarly
+            //this is necessary because GCS is no longer sending the heartbeat when receiving files...
+            //TODO: add a thread in GCS for receiving file
+            //but be careful that with a xbee modem for exemple, sending files can saturate communication and
+            //avoid the heartbeat to be received... so disabling watchdog is not a so bad option...
+            if(caller->gcs_watchdog!=NULL) {
+                caller->gcs_watchdog->SafeStop();
+                caller->gcs_watchdog->Join();
+            }
           for (size_t i = 0; i < logs.size(); i++) {
             if (logs.at(i).dbtFile != NULL) {
@@ -837 +850 @@
 
           logs.clear();
+            //enable watchdog again
+            if(caller->gcs_watchdog!=NULL) {
+                caller->gcs_watchdog->Start();
+            }
         }
       }

trunk/lib/FlairCore/src/Thread_impl.cpp

@@ -70 +70 @@
 
   isRunning = true;
+  tobestopped = false;
+  is_suspended = false;
 
 #ifdef __XENO__

trunk/tools/FlairGCS/src/UdtSocket.cpp

@@ -192 +192 @@
     file_dialog->endOfFiles();
     flag_new_seq = true;
+    //end ack
+    UDT::sendmsg(file_socket,&recv_buf[0],1);
   }
 }