Changeset 247 in flair-src

Timestamp:

May 28, 2018, 6:23:35 PM (7 years ago)

Author:

Sanahuja Guillaume

Message:

improve gcs disconnections

Location:

trunk

Files:

• lib/FlairCore/src/ui_com.cpp (modified) (3 diffs)
• lib/FlairCore/src/unexported/communication.h (modified) (1 diff)
• lib/FlairFilter/src/Pid.cpp (modified) (1 diff)
• lib/FlairFilter/src/Pid.h (modified) (1 diff)
• tools/FlairGCS/src/ConnectionLayout.cpp (modified) (2 diffs)
• tools/FlairGCS/src/ConnectionLayout.h (modified) (1 diff)
• tools/FlairGCS/src/Manager.cpp (modified) (13 diffs)
• tools/FlairGCS/src/Manager.h (modified) (3 diffs)
• tools/FlairGCS/src/UdtSocket.cpp (modified) (3 diffs)
• tools/FlairGCS/src/green.png (added)
• tools/FlairGCS/src/red.png (added)
• tools/FlairGCS/src/ressources.qrc (modified) (1 diff)

trunk/lib/FlairCore/src/ui_com.cpp

@@ -105 +105 @@
   if (UDT::setsockopt(socket_fd, 0, UDT_RCVTIMEO, &timeout, sizeof(int)) != 0)
     Err("UDT::setsockopt error (UDT_RCVTIMEO)\n");
-
+    /*
+  timeout=-1;
+  if (UDT::setsockopt(socket_fd, 0, UDT_SNDTIMEO, &timeout, sizeof(int)) != 0)
+    Err("UDT::setsockopt error (UDT_SNDTIMEO)\n");
+*/
   bool blocking = true;
   if (UDT::setsockopt(socket_fd, 0, UDT_SNDSYN, &blocking, sizeof(bool)) != 0)
@@ -138 +142 @@
 
   Join();
-
+  
+  char buf=CLOSING_CONNECTION;
+  Send(&buf,1);
+ 
   if (send_buffer != NULL)
     free(send_buffer);
@@ -196 +203 @@
   nb_write = UDT::sendmsg(socket_fd, tosend, size, -1, true);
 #endif // COMPRESS_FRAMES
-  // Printf("write %i %i\n",nb_write,size);
+   //Printf("write %i %i\n",nb_write,size);
   if (nb_write < 0) {
     Err("UDT::sendmsg error (%s)\n", UDT::getlasterror().getErrorMessage());

trunk/lib/FlairCore/src/unexported/communication.h

@@ -12 +12 @@
 #define DATAS_LITTLE_ENDIAN 0x02
 #define DATAS_BIG_ENDIAN 0x03
+#define CLOSING_CONNECTION 0x04
 
+//messages file socket
 #define START_SENDING_FILES 0x10
 #define FILE_INFO_LITTLE_ENDIAN 0x11

trunk/lib/FlairFilter/src/Pid.cpp

@@ -47 +47 @@
 }
 
+float Pid::GetIntegral(void) const { return pimpl_->i; }
+
 void Pid::UpdateFrom(const io_data *data) {
   pimpl_->UpdateFrom(data);

trunk/lib/FlairFilter/src/Pid.h

@@ -58 +58 @@
   */
   void Reset(void);
+  
+   /*!
+  * \brief Get intergral part
+  *
+  * \return current integral part
+  */
+  float GetIntegral(void) const;
+
 
   /*!

trunk/tools/FlairGCS/src/ConnectionLayout.cpp

@@ -18 +18 @@
 }
 
-QString ConnectionLayout::getUDTStats() {
-  return socket->getUDTStats();
-}
-
 void ConnectionLayout::receive(char *buf, int size) {
-  // fprintf(stderr,"trame %x\n",buf[0]);
+   //fprintf(stderr,"trame %x\n",buf[0]);
   // for(int i=0; i<size;i++) fprintf(stderr,"%x ",buf[i]);
   // fprintf(stderr,"\n");
@@ -57 +53 @@
     // fprintf(stderr,"recu %i period %i\n",size,period);
     drawDatas(&buf[3], size - 3, period);
+    break;
+  }
+  case CLOSING_CONNECTION: {
+    deleteLater();
     break;
   }

trunk/tools/FlairGCS/src/ConnectionLayout.h

@@ -22 +22 @@
   void LoadXml(QDomDocument to_parse);
   QString getName();
-  QString getUDTStats();
   static QString getDocRootName(char* buf, int size);
 

trunk/tools/FlairGCS/src/Manager.cpp

@@ -46 +46 @@
   // tab bar for multiple connections
   tabBar = new QTabBar();
+  //tabBar->setTabsClosable(true);
   managerLayout->addWidget(tabBar);
   connect(tabBar, SIGNAL(currentChanged(int)), this,
@@ -95 +96 @@
   }
 
+  
+  icon_ok = QIcon(":green.png");
+  icon_ko = QIcon(":red.png");
+  
+  
   QTimer *timer = new QTimer(this);
   connect(timer, SIGNAL(timeout()), this, SLOT(acceptConnections()));
@@ -101 +107 @@
 
 Manager::~Manager() {
-  for (int i = 0; i < udtSockets.count(); i++) {
-    udtSockets.at(i)->kill();
-    udtSockets.at(i)->thread()->wait();
+  for (int i = 0; i < connections.count(); i++) {
+    connections.at(i).socket->kill();
+    connections.at(i).socket->thread()->wait();
   }
 
@@ -127 +133 @@
     UdtSocket *udtSocket = new UdtSocket(socket,name);
     udtSocket->moveToThread(thread);
-    udtSockets.append(udtSocket);
-
+    
     connect(udtSocket, SIGNAL(newFileUI(UDTSOCKET)), this, SLOT(newFileUI(UDTSOCKET)));
     connect(udtSocket, SIGNAL(newConnectionLayout(QString)), this, SLOT(newConnectionLayout(QString)),Qt::BlockingQueuedConnection);
@@ -141 +146 @@
   
   ConnectionLayout *newLayout = new ConnectionLayout(udtSocket, name);
-  connectionsLayout.append(newLayout);
   connect(udtSocket, SIGNAL(UDTStats(QString)), newLayout, SIGNAL(UDTStats(QString)));//connection in 2 steps to get udtsocket as sender
   connect(newLayout, SIGNAL(UDTStats(QString)), this, SLOT(printUDTStats(QString)));
@@ -147 +151 @@
   connect(newLayout, SIGNAL(destroyed(QObject *)), this, SLOT(layoutDestroyed(QObject *)));
   connect(udtSocket, SIGNAL(destroyed(QObject *)), this, SLOT(udtSocketDestroyed(QObject *)));
-  connect(udtSocket, SIGNAL(destroyed()), newLayout, SLOT(deleteLater()));
-  
-   // widget
+  
+  // widget
   QWidget *newWidget = new QWidget();
-  connectionsWidget.append(newWidget);
   newWidget->setLayout(newLayout->getQGridLayout());
   managerLayout->insertWidget(1, newWidget);
   newWidget->hide();
   
+  connections_t connection;
+  connection.layout=newLayout;
+  connection.widget=newWidget;
+  connection.socket=udtSocket;
+  connections.append(connection);
+  
   //tab: avoid having only 1 tab (0, 2 or more)
-  if (connectionsLayout.count() == 1) { // first connection
-    connectionsWidget.at(0)->show();
+  if (connections.count() == 1) { // first connection
+    newWidget->show();
     hiddenTabName = name;
   }
-  if (connectionsLayout.count() == 2) {
-    tabBar->addTab(hiddenTabName);
+  if (connections.count() == 2) {
+    tabBar->addTab(icon_ok,hiddenTabName);
     currentTab = 0;
   }
-  if (connectionsLayout.count() > 1) {
-    tabBar->addTab(name);
+  if (connections.count() > 1) {
+    tabBar->addTab(icon_ok,name);
   }
 }
 
 void Manager::udtSocketDestroyed(QObject *obj) {
-  udtSockets.removeOne((UdtSocket *)obj);
+  fprintf(stderr,"sockets -1\n");
+  //mark socket as not valid, it can be a connection lost
+  //in this case we keep the layout for reading, and mark it as problematic
+  fprintf(stderr,"change icon\n");
+  for(int i=0;i<connections.count();i++) {
+    if(connections.at(i).socket==(UdtSocket *)obj) {
+      connections[i].socket=NULL;
+      break;
+    }
+  }
 }
 
 void Manager::layoutDestroyed(QObject *obj) {
-  int index = connectionsLayout.indexOf((ConnectionLayout *)obj);
-
-  delete connectionsWidget.at(index);
-  connectionsWidget.removeAt(index);
-  connectionsLayout.removeOne((ConnectionLayout *)obj);
-  
-  //tab: avoid having only 1 tab (0, 2 or more)
+  fprintf(stderr,"layout -1\n");
+  //remove the connection, it comes from a proper close
+  int index=-1;
+  for(int i=0;i<connections.count();i++) {
+    if(connections.at(i).layout==(ConnectionLayout *)obj) {
+      delete connections.at(i).widget;
+      //connections[i].widget=NULL;
+      //connections[i].layout=NULL;
+      connections.removeAt(i);
+      index=i;
+      break;
+    }
+  }
+  
+  if(index==-1) {
+    fprintf(stderr,"layoutDestroyed: error, layout not found!\n");
+    return;
+  }
+  
+  //tab: avoid having only 1 tab (only 0, 2 or more)
   if (tabBar->count() > 1) {
     tabBar->removeTab(index);
   }
 
-  if (connectionsLayout.count() == 1) {
+  if (connections.count() == 1) {
     hiddenTabName = tabBar->tabText(0);
     tabBar->removeTab(0);
   }
 
-  if (connectionsLayout.count() == 0) {
+  if (connections.count() == 0) {
     status->showMessage("");
   }
-  
-  
 }
 
 void Manager::newFileUI(UDTSOCKET socket) {
-  //remove udtsocket as it will be automatically destroyed
-  udtSockets.removeOne((UdtSocket *)sender());
-  
   QThread *thread = new QThread(this);
   file_ui* fileUi = new file_ui(socket,name);
@@ -216 +241 @@
 
 void Manager::printUDTStats(QString stats) {
-  int index = connectionsLayout.indexOf((ConnectionLayout *)sender());
+  int index = -1;
+  for(int i=0;i<connections.count();i++) {
+    if(connections.at(i).layout==(ConnectionLayout *)sender()) {
+      index=i;
+      break;
+    }
+  }
+  
   if(index==-1) return;
   
@@ -230 +262 @@
   if (index >= 0) {
     //if we are coming from layout destroyed
-    if(currentTab<connectionsLayout.count()) connectionsWidget.at(currentTab)->hide();
-    connectionsWidget.at(index)->show();
+    if(currentTab<connections.count()) connections.at(currentTab).widget->hide();
+    connections.at(index).widget->show();
     currentTab = index;
   } else {
     currentTab = 0;
-    connectionsWidget.at(0)->show();
-  }
+    connections.at(0).widget->show();
+  }
+  QString msg="not connected";
   if (tabBar->count() == 0) {
-    status->showMessage(connectionsLayout.at(0)->getUDTStats());
+    if(connections.at(0).socket!=NULL) msg=connections.at(0).socket->getUDTStats();
+    
   } else {
-    status->showMessage(QString("%1: %2").arg(tabBar->tabText(index)).arg(connectionsLayout.at(index)->getUDTStats()));
-  }
+    if(connections.at(index).socket!=NULL) msg=QString("%1: %2").arg(tabBar->tabText(index)).arg(connections.at(index).socket->getUDTStats());
+  }
+  status->showMessage(msg);
 }
 
@@ -249 +284 @@
 
   if (dir_name != "") {
-    for (int i = 0; i < connectionsLayout.count(); i++) {
+    for (int i = 0; i < connections.count(); i++) {
       QFile *file;
       file = new QFile(dir_name + "/" +
-                       connectionsLayout.at(i)->getName() + ".xml");
+                       connections.at(i).layout->getName() + ".xml");
       if (!file->open(QIODevice::ReadOnly | QIODevice::Text)) {
         QMessageBox::warning(this, "Warning",
                              "Enable to load " +
-                                 connectionsLayout.at(i)->getName() +
+                                 connections.at(i).layout->getName() +
                                  ".xml");
         continue;
@@ -268 +303 @@
         QMessageBox::critical(
             this, "Error",
-            "unable to read " + connectionsLayout.at(i)->getName() +
+            "unable to read " + connections.at(i).layout->getName() +
                 ".xml" + " (" + errorMsg + " at " + QString::number(errorLine) +
                 "," + QString::number(errorColumn) + ")");
       } else {
-        connectionsLayout.at(i)->LoadXml(doc);
+        connections.at(i).layout->LoadXml(doc);
       }
       delete file;
@@ -282 +317 @@
   bool isUptodate = true;
 
-  for (int i = 0; i < connectionsLayout.count(); i++) {
-    if (!connectionsLayout.at(i)->IsUptodate()) {
+  for (int i = 0; i < connections.count(); i++) {
+    if (!connections.at(i).layout->IsUptodate()) {
       isUptodate = false;
       break;
@@ -319 +354 @@
   QDir().mkdir(dir_name);
 
-  for (int i = 0; i < connectionsLayout.count(); i++) {
+  for (int i = 0; i < connections.count(); i++) {
     QDomDocument *xml = new QDomDocument("remote_ui_xml");
 
-    connectionsLayout.at(i)->GetFullXml((QDomElement *)xml);
-
-    QFile fichier(dir_name + "/" + connectionsLayout.at(i)->getName() +
+    connections.at(i).layout->GetFullXml((QDomElement *)xml);
+
+    QFile fichier(dir_name + "/" + connections.at(i).layout->getName() +
                   ".xml");
     QString write_doc = (xml->ownerDocument()).toString();
@@ -344 +379 @@
 
 void Manager::send(void) {
-  for (int i = 0; i < connectionsLayout.count(); i++) {
+  for (int i = 0; i < connections.count(); i++) {
     QDomDocument doc("remote_ui_xml");
-    connectionsLayout.at(i)->GetUpdateXml((QDomElement *)&doc);
+    connections.at(i).layout->GetUpdateXml((QDomElement *)&doc);
     // fprintf(stderr,"merge\n%s\n",doc.toString().toLocal8Bit().constData());
 
-    connectionsLayout.at(i)->XmlToSend(doc);
+    connections.at(i).layout->XmlToSend(doc);
   }
 }
 
 void Manager::reset() {
-  for (int i = 0; i < connectionsLayout.count(); i++)
-    connectionsLayout.at(i)->ResetAllChilds();
-}
+  for (int i = 0; i < connections.count(); i++)
+    connections.at(i).layout->ResetAllChilds();
+}

trunk/tools/FlairGCS/src/Manager.h

@@ -7 +7 @@
 
 #include <QWidget>
+#include <QIcon>
 #include <udt.h>
 #include <qdom.h>
@@ -28 +29 @@
   UDTSOCKET serv;
   QVBoxLayout *managerLayout;
-  QList<ConnectionLayout *> connectionsLayout;
-  QList<QWidget *> connectionsWidget;
-  QList<UdtSocket *> udtSockets;
+  typedef struct {
+    ConnectionLayout *layout;
+    QWidget *widget;
+    UdtSocket *socket;
+  } connections_t;
+  QList<connections_t> connections;
+  //QList<ConnectionLayout *> connectionsLayout;
+  //QList<UdtSocket *> udtSockets;
   QTabBar *tabBar;
   QString name, hiddenTabName;
@@ -41 +47 @@
   QGridLayout *button_layout;
   QStatusBar *status;
+  QIcon icon_ok,icon_ko;
 
 private slots:

trunk/tools/FlairGCS/src/UdtSocket.cpp

@@ -53 +53 @@
   heartbeat_timer->stop();
   udtstats_timer->stop();
-  if(destroySocket) UDT::close(socket);         
+  if(destroySocket) UDT::close(socket);
+fprintf(stderr,"fin udt\n");
 }
 
@@ -151 +152 @@
     int num = 1;
     UDTSOCKET readfds;
+  
     int rv = UDT::epoll_wait2(eid, &readfds, &num,NULL, NULL,100);
-  
     if (rv == -1) {
       if (UDT::getlasterror().getErrorCode() != 6003)
@@ -158 +159 @@
     } else if(readfds==socket && num==1 && rv==1) {
        
-      int size=UDT::recvmsg(socket, buf, buf_size);
-      if (size > 0) {
-        total_received+=size;
-        
-        switch ((unsigned char)buf[0]) {
-          case ZLIB_HEADER: {
-            ssize_t out_size;
-            uncompressBuffer(buf, size, uncompressbuf, &out_size);
-            if((unsigned char)uncompressbuf[0]==XML_HEADER && socketType==unknown) {
-              socketType=gui;
-              QString remoteName=ConnectionLayout::getDocRootName(uncompressbuf, out_size);
-              setName(remoteName);
-              emit newConnectionLayout(remoteName);//connection is Qt::BlockingQueuedConnection
+      int size;
+      do {
+        size=UDT::recvmsg(socket, buf, buf_size);
+      
+        //fprintf(stderr,"recu %i\n",size);
+        if (size > 0) {
+          total_received+=size;
+          
+          switch ((unsigned char)buf[0]) {
+            case ZLIB_HEADER: {
+              ssize_t out_size;
+              uncompressBuffer(buf, size, uncompressbuf, &out_size);
+              if((unsigned char)uncompressbuf[0]==XML_HEADER && socketType==unknown) {
+                socketType=gui;
+                QString remoteName=ConnectionLayout::getDocRootName(uncompressbuf, out_size);
+                setName(remoteName);
+                emit newConnectionLayout(remoteName);//connection is Qt::BlockingQueuedConnection
+              }
+              emit dataReady(uncompressbuf, out_size);//connection is Qt::BlockingQueuedConnection, as we have only one buffer
+              break;
             }
-            emit dataReady(uncompressbuf, out_size);//connection is Qt::BlockingQueuedConnection, as we have only one buffer
-            break;
+            case START_SENDING_FILES: {
+              if((unsigned char)uncompressbuf[0]==XML_HEADER && socketType==unknown) {
+                socketType=log;
+              }
+              setName("log files");
+              heartbeat_timer->stop();
+              emit newFileUI(socket);
+              deleteLater();
+              stop=true;
+              destroySocket=false;
+              break;
+            }
+            case XML_HEADER:
+              if(socketType==unknown) {
+                socketType=gui;
+                QString remoteName=ConnectionLayout::getDocRootName(buf, size );
+                setName(remoteName);
+                emit newConnectionLayout(remoteName);
+              }
+            case DATAS_BIG_ENDIAN:
+            case DATAS_LITTLE_ENDIAN:
+              emit dataReady(buf, size );
+              break;
+            case CLOSING_CONNECTION:
+              fprintf(stderr,"%s, connection closed\n",name.toLocal8Bit().constData());
+              emit dataReady(buf, size );
+              stop = true;
+              heartbeat_timer->stop();
+              deleteLater();
+              break;
+            default:
+              fprintf(stderr,"trame non supportée %x\n", buf[0]);
           }
-          case START_SENDING_FILES: {
-            if((unsigned char)uncompressbuf[0]==XML_HEADER && socketType==unknown) {
-              socketType=log;
-            }
-            setName("log files");
-            heartbeat_timer->stop();
-            emit newFileUI(socket);
-            deleteLater();
-            stop=true;
-            destroySocket=false;
-            break;
-          }
-          case XML_HEADER:
-            if(socketType==unknown) {
-              socketType=gui;
-              QString remoteName=ConnectionLayout::getDocRootName(buf, size );
-              setName(remoteName);
-              emit newConnectionLayout(remoteName);
-            }
-          case DATAS_BIG_ENDIAN:
-          case DATAS_LITTLE_ENDIAN:
-            emit dataReady(buf, size );
-            break;
+        } else {
+          //not necessary to check, watchdog (heartbeat_timer) can do it
+          //if(UDT::getlasterror().getErrorCode()!=6002 && !stop) 
+            //fprintf(stderr,"udt socket: %s\n",UDT::getlasterror().getErrorMessage());
+          //UDT::close(socket);//si deconnecté
+          //free(buf);
+          //break;
         }
-      } else {
-        if(UDT::getlasterror().getErrorCode()!=6002) 
-          fprintf(stderr,"udt socket: %s %i\n",UDT::getlasterror().getErrorMessage(),size);
-        //UDT::close(socket);//si deconnecté
-        //free(buf);
-        //break;
-      }
+      } while(size>0);
     } else {
-      fprintf(stderr,"udt socket: %s\n",UDT::getlasterror().getErrorMessage());
+      //not necessary to check, watchdog (heartbeat_timer) can do it
+      //fprintf(stderr,"udt socket: %s\n",UDT::getlasterror().getErrorMessage());
     }
     UDT::epoll_remove_usock(eid, socket);
     UDT::epoll_release(eid);
   }
+  
   free(uncompressbuf);
   free(buf);

trunk/tools/FlairGCS/src/ressources.qrc

@@ -5 +5 @@
   <file>landmark.png</file>
   <file>cross.png</file>
+  <file>green.png</file>
+  <file>red.png</file>
 </qresource>
 </RCC>