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

Timestamp:

05/24/18 11:45:33 (6 years ago)

Author:

Sanahuja Guillaume

Message:

modifs segfault when closing connection

File:

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

trunk/tools/FlairGCS/src/Manager.cpp

@@ -37 +37 @@
   qRegisterMetaType<QModelIndex>("QModelIndex"); // pour le file ui??
   this->name = name;
-//fprintf(stderr,"Manager %x\n",thread());
+//ffprintf(stderr,stderr,"Manager %x\n",thread());
   setWindowTitle(name);
 
@@ -88 +88 @@
 
   if (UDT::ERROR == UDT::bind(serv, (sockaddr *)&my_addr, sizeof(my_addr))) {
-    printf("bind error, %s\n", UDT::getlasterror().getErrorMessage());
+    fprintf(stderr,"bind error, %s\n", UDT::getlasterror().getErrorMessage());
   }
 
   if (UDT::ERROR == UDT::listen(serv, 1)) {
-    printf("listen error, %s\n", UDT::getlasterror().getErrorMessage());
+    fprintf(stderr,"listen error, %s\n", UDT::getlasterror().getErrorMessage());
   }
 
@@ -101 +101 @@
 
 Manager::~Manager() {
-  printf("%i\n",udtSockets.count());
   for (int i = 0; i < udtSockets.count(); i++) {
     udtSockets.at(i)->kill();
@@ -109 +108 @@
   // delete main_layout;
   UDT::cleanup();
-  printf("ok\n");
 }
 
@@ -120 +118 @@
   if (UDT::INVALID_SOCK ==(socket = UDT::accept(serv, (sockaddr *)&their_addr, &namelen))) {
     if (UDT::getlasterror().getErrorCode() != 6002)
-      printf("accept error: %s, code %i\n", UDT::getlasterror().getErrorMessage(),UDT::getlasterror().getErrorCode());
+      fprintf(stderr,"accept error: %s, code %i\n", UDT::getlasterror().getErrorMessage(),UDT::getlasterror().getErrorCode());
     return;
   } else {
     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());
+    fprintf(stderr,"connected to %s\n",name.toLocal8Bit().constData());
     
     QThread *thread = new QThread(this);
@@ -148 +146 @@
   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(QObject *)), this, SLOT(udtSocketDestroyed(QObject *)));
   connect(udtSocket, SIGNAL(destroyed()), newLayout, SLOT(deleteLater()));
   
@@ -171 +170 @@
 }
 
+void Manager::udtSocketDestroyed(QObject *obj) {
+  udtSockets.removeOne((UdtSocket *)obj);
+}
+
 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)
   if (tabBar->count() > 1) {
@@ -179 +186 @@
   }
 
-  delete connectionsWidget.at(index);
-  connectionsWidget.removeAt(index);
-  connectionsLayout.removeOne((ConnectionLayout *)obj);
-
   if (connectionsLayout.count() == 1) {
     hiddenTabName = tabBar->tabText(0);
@@ -191 +194 @@
     status->showMessage("");
   }
+  
+  
 }
 
@@ -222 +227 @@
 
 void Manager::tabBarCurrentChanged(int index) {
+  
   if (index >= 0) {
-    connectionsWidget.at(currentTab)->hide();
+    //if we are coming from layout destroyed
+    if(currentTab<connectionsLayout.count()) connectionsWidget.at(currentTab)->hide();
     connectionsWidget.at(index)->show();
     currentTab = index;
@@ -230 +237 @@
     connectionsWidget.at(0)->show();
   }
-  
   if (tabBar->count() == 0) {
     status->showMessage(connectionsLayout.at(0)->getUDTStats());
@@ -341 +347 @@
     QDomDocument doc("remote_ui_xml");
     connectionsLayout.at(i)->GetUpdateXml((QDomElement *)&doc);
-    // printf("merge\n%s\n",doc.toString().toLocal8Bit().constData());
+    // fprintf(stderr,"merge\n%s\n",doc.toString().toLocal8Bit().constData());
 
     connectionsLayout.at(i)->XmlToSend(doc);