Changeset 234 in flair-src for trunk/tools/FlairGCS/src/Manager.cpp

Timestamp:

04/10/18 17:05:27 (6 years ago)

Author:

Sanahuja Guillaume

Message:

create file oscket only when necessary

File:

• trunk/tools/FlairGCS/src/Manager.cpp (modified) (12 diffs)

trunk/tools/FlairGCS/src/Manager.cpp

@@ -7 +7 @@
 #include "ConnectionLayout.h"
 #include "communication.h"
+#include "file_ui.h"
 #include <QDate>
 #include <QFileDialog>
@@ -17 +18 @@
 #include <QVBoxLayout>
 #include <QModelIndex>
-//#include <qmetatype.h>
+#include <QStatusBar>
 #include <qendian.h>
 #include <iostream>
@@ -36 +37 @@
   qRegisterMetaType<QModelIndex>("QModelIndex"); // pour le file ui??
   this->name = name;
-
+//fprintf(stderr,"Manager %x\n",thread());
   setWindowTitle(name);
-//statusBar()->showMessage(tr("Ready to serve"));
+
   // manager layout
   managerLayout = new QVBoxLayout;
@@ -79 +80 @@
   bool blocking = false;
   UDT::setsockopt(serv, 0, UDT_RCVSYN, &blocking, sizeof(bool));
-
+//UDT::setsockopt(serv, 0, UDT_CC, new CCCFactory<CUDPBlast>, sizeof(CCCFactory<CUDPBlast>));
   sockaddr_in my_addr;
   my_addr.sin_family = AF_INET;
@@ -96 +97 @@
   QTimer *timer = new QTimer(this);
   connect(timer, SIGNAL(timeout()), this, SLOT(acceptConnections()));
-  timer->start(20);
+  timer->start(500);
 }
 
 Manager::~Manager() {
-  emit killUdtSockets();
+  printf("%i\n",udtSockets.count());
+  for (int i = 0; i < udtSockets.count(); i++) {
+    udtSockets.at(i)->kill();
+    udtSockets.at(i)->thread()->wait();
+  }
 
   // delete main_layout;
   UDT::cleanup();
+  printf("ok\n");
 }
 
 void Manager::acceptConnections(void) {
-  static UDTSOCKET first_socket = 0;
   UDTSOCKET socket;
 
@@ -113 +118 @@
   int namelen = sizeof(their_addr);
 
-  if (UDT::INVALID_SOCK ==
-      (socket = UDT::accept(serv, (sockaddr *)&their_addr, &namelen))) {
+  if (UDT::INVALID_SOCK ==(socket = UDT::accept(serv, (sockaddr *)&their_addr, &namelen))) {
     if (UDT::getlasterror().getErrorCode() != 6002)
-      printf("accept: %s, code %i\n", UDT::getlasterror().getErrorMessage(),
-             UDT::getlasterror().getErrorCode());
+      printf("accept error: %s, code %i\n", UDT::getlasterror().getErrorMessage(),UDT::getlasterror().getErrorCode());
     return;
   } else {
-    printf("connected to %s:%i\n", inet_ntoa(their_addr.sin_addr),
-           their_addr.sin_port);
-
-    if (!first_socket) {
-      first_socket = socket;
-      return;
-    } else {
-      QThread *thread = new QThread(this);
-      UdtSocket *new_udt = new UdtSocket(first_socket, socket, name);
-      new_udt->moveToThread(thread);
-
-      newConnection(new_udt);
-
-      connect(this, SIGNAL(killUdtSockets()), thread, SLOT(quit()));
-      connect(this, SIGNAL(killUdtSockets()), new_udt, SLOT(kill()),
-              Qt::BlockingQueuedConnection);
-
-      connect(thread, SIGNAL(started()), new_udt, SLOT(handleConnections()));
-
-      thread->start();
-      first_socket = 0;
-    }
-  }
-}
-
-void Manager::newConnection(UdtSocket *socket) {
-
-  // no tabs to 2 tabs
-  if (connectionsLayout.count() == 1) {
-    tabBar->addTab(hiddenTabName);
-    currentTab = 0;
-    connectionsWidget.at(0)->show();
-  }
-
-  // layout utilisateur
-  ConnectionLayout *newLayout = new ConnectionLayout(socket, "interface");
+    QString name=QString("%1:%2").arg(inet_ntoa(their_addr.sin_addr)).arg(their_addr.sin_port);
+    printf("connected to %s\n",name.toLocal8Bit().constData());
+    
+    QThread *thread = new QThread(this);
+    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);
+    connect(thread, SIGNAL(started()), udtSocket, SLOT(receiveData()));
+
+    thread->start();  
+  }
+}
+
+void Manager::newConnectionLayout(QString name) {
+  UdtSocket* udtSocket=(UdtSocket *)sender();
+  
+  ConnectionLayout *newLayout = new ConnectionLayout(udtSocket, name);
   connectionsLayout.append(newLayout);
-  connect(newLayout, SIGNAL(setRemoteName(QString)), this,
-          SLOT(tabName(QString)));
-  connect(newLayout, SIGNAL(computedRxRate(float)), this,
-          SLOT(printRxRates(float)));
-  connect(socket, SIGNAL(dataReady(char *, int)), newLayout,
-          SLOT(receive(char *, int)));
-  connect(newLayout, SIGNAL(destroyed(QObject *)), this,
-          SLOT(layoutDestroyed(QObject *)));
-  connect(socket, SIGNAL(destroyed()), newLayout, SLOT(deleteLater()));
-
-  // widget
+  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)));
+  connect(udtSocket, SIGNAL(dataReady(char *, int)), newLayout,SLOT(receive(char *, int)),Qt::BlockingQueuedConnection);
+  connect(newLayout, SIGNAL(destroyed(QObject *)), this, SLOT(layoutDestroyed(QObject *)));
+  connect(udtSocket, SIGNAL(destroyed()), newLayout, SLOT(deleteLater()));
+  
+   // widget
   QWidget *newWidget = new QWidget();
   connectionsWidget.append(newWidget);
@@ -173 +156 @@
   managerLayout->insertWidget(1, newWidget);
   newWidget->hide();
-
+  
+  //tab: avoid having only 1 tab (0, 2 or more)
   if (connectionsLayout.count() == 1) { // first connection
-    newWidget->show();
-  } else { // add a tab for the new connection
-    tabBar->addTab("unknown");
-  }
-}
-
-void Manager::printRxRates(float rxRate) {
+    connectionsWidget.at(0)->show();
+    hiddenTabName = name;
+  }
+  if (connectionsLayout.count() == 2) {
+    tabBar->addTab(hiddenTabName);
+    currentTab = 0;
+  }
+  if (connectionsLayout.count() > 1) {
+    tabBar->addTab(name);
+  }
+}
+
+void Manager::layoutDestroyed(QObject *obj) {
+  int index = connectionsLayout.indexOf((ConnectionLayout *)obj);
+
+  //tab: avoid having only 1 tab (0, 2 or more)
+  if (tabBar->count() > 1) {
+    tabBar->removeTab(index);
+  }
+
+  delete connectionsWidget.at(index);
+  connectionsWidget.removeAt(index);
+  connectionsLayout.removeOne((ConnectionLayout *)obj);
+
+  if (connectionsLayout.count() == 1) {
+    hiddenTabName = tabBar->tabText(0);
+    tabBar->removeTab(0);
+  }
+
+  if (connectionsLayout.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);
+  fileUi->moveToThread(thread);
+  connect(thread, SIGNAL(started()), fileUi, SLOT(receive()));
+  connect(fileUi, SIGNAL(finished()), this, SLOT(deleteFileUI()));
+  thread->start();
+}
+
+void Manager::deleteFileUI(void) {
+  sender()->thread()->quit();
+  delete sender();
+}
+
+void Manager::printUDTStats(QString stats) {
   int index = connectionsLayout.indexOf((ConnectionLayout *)sender());
-
+  if(index==-1) return;
+  
   if (tabBar->count() == 0) {
-    status->showMessage(tr("rx rate %1 kB/s").arg(rxRate,0,'f',3));
+    status->showMessage(stats);
   } else if (index==tabBar->currentIndex()) {
-    status->showMessage(tr("%1 rx rate %2 kB/s").arg(tabBar->tabText(index)).arg(rxRate,0,'f',3));
+    status->showMessage(QString("%1: %2").arg(tabBar->tabText(index)).arg(stats));
   }
 }
@@ -200 +230 @@
     connectionsWidget.at(0)->show();
   }
-}
-
-void Manager::tabName(QString name) {
-  int index = connectionsLayout.indexOf((ConnectionLayout *)sender());
+  
   if (tabBar->count() == 0) {
-    hiddenTabName = name;
+    status->showMessage(connectionsLayout.at(0)->getUDTStats());
   } else {
-    tabBar->setTabText(index, name);
-  }
-}
-
-void Manager::layoutDestroyed(QObject *obj) {
-  int index = connectionsLayout.indexOf((ConnectionLayout *)obj);
-
-  if (tabBar->count() > 1) {
-    tabBar->removeTab(index);
-  }
-
-  delete connectionsWidget.at(index);
-  connectionsWidget.removeAt(index);
-  connectionsLayout.removeOne((ConnectionLayout *)obj);
-
-  if (connectionsLayout.count() == 1) {
-    hiddenTabName = tabBar->tabText(0);
-    tabBar->removeTab(0);
-  }
-
-  if (connectionsLayout.count() == 0) {
-    status->showMessage("");
+    status->showMessage(QString("%1: %2").arg(tabBar->tabText(index)).arg(connectionsLayout.at(index)->getUDTStats()));
   }
 }
@@ -240 +246 @@
       QFile *file;
       file = new QFile(dir_name + "/" +
-                       connectionsLayout.at(i)->getRemoteName() + ".xml");
+                       connectionsLayout.at(i)->getName() + ".xml");
       if (!file->open(QIODevice::ReadOnly | QIODevice::Text)) {
         QMessageBox::warning(this, "Warning",
                              "Enable to load " +
-                                 connectionsLayout.at(i)->getRemoteName() +
+                                 connectionsLayout.at(i)->getName() +
                                  ".xml");
         continue;
@@ -256 +262 @@
         QMessageBox::critical(
             this, "Error",
-            "unable to read " + connectionsLayout.at(i)->getRemoteName() +
+            "unable to read " + connectionsLayout.at(i)->getName() +
                 ".xml" + " (" + errorMsg + " at " + QString::number(errorLine) +
                 "," + QString::number(errorColumn) + ")");
@@ -312 +318 @@
     connectionsLayout.at(i)->GetFullXml((QDomElement *)xml);
 
-    QFile fichier(dir_name + "/" + connectionsLayout.at(i)->getRemoteName() +
+    QFile fichier(dir_name + "/" + connectionsLayout.at(i)->getName() +
                   ".xml");
     QString write_doc = (xml->ownerDocument()).toString();
@@ -322 +328 @@
     }
     QTextStream stream(&fichier);
-    stream << write_doc; // On utilise l'opérateur << pour écrire write_doc dans
-                         // le document XML.
+    stream << write_doc;
     fichier.close();