Changeset 244 in flair-src for trunk/tools/FlairGCS/src/UdtSocket.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/UdtSocket.cpp (modified) (9 diffs)

trunk/tools/FlairGCS/src/UdtSocket.cpp

@@ -39 +39 @@
   bool blocking = false;
   if (UDT::setsockopt(socket, 0, UDT_RCVSYN, &blocking, sizeof(bool)) != 0)
-    printf("UDT::setsockopt error (UDT_RCVSYN)\n");
+    fprintf(stderr,"UDT::setsockopt error (UDT_RCVSYN)\n");
     
   heartbeat_timer = new QTimer(this);
@@ -57 +57 @@
 
 void UdtSocket::setName(QString name) {
-  printf("  %s is %s\n",this->name.toLocal8Bit().constData(),name.toLocal8Bit().constData());
+  fprintf(stderr,"  %s is %s\n",this->name.toLocal8Bit().constData(),name.toLocal8Bit().constData());
   this->name=name;
 }
@@ -79 +79 @@
   UDT::TRACEINFO perf;
   if (UDT::ERROR == UDT::perfmon(socket, &perf))   {
-    printf("perfmon: %s\n",UDT::getlasterror().getErrorMessage());
+    fprintf(stderr,"perfmon: %s\n",UDT::getlasterror().getErrorMessage());
   }/* else {
-    printf("%s socket stats:\n",name.toLocal8Bit().constData());
-    printf("total number of sent packets, including retransmissions: %i\n",perf.pktSentTotal);
-    printf("total number of received packets: %i\n",perf.pktRecvTotal);
-    printf("total number of lost packets, measured in the sending side: %i\n",perf.pktSndLossTotal);
-    printf("total number of lost packets, measured in the receiving side: %i\n",perf.pktRcvLossTotal);
-    printf("total number of retransmitted packets, measured in the sending side: %i\n",perf.pktRetransTotal);
-    printf("total number of sent ACK packets: %i\n",perf.pktSentACKTotal);
-    printf("total number of received ACK packets: %i\n",perf.pktRecvACKTotal);
-    printf("total number of sent NAK packets: %i\n",perf.pktSentNAKTotal);
-    printf("total number of received NAK packets: %i\n",perf.pktRecvNAKTotal);
-    printf("round trip time: %fms\n",perf.msRTT);
+    fprintf(stderr,"%s socket stats:\n",name.toLocal8Bit().constData());
+    fprintf(stderr,"total number of sent packets, including retransmissions: %i\n",perf.pktSentTotal);
+    fprintf(stderr,"total number of received packets: %i\n",perf.pktRecvTotal);
+    fprintf(stderr,"total number of lost packets, measured in the sending side: %i\n",perf.pktSndLossTotal);
+    fprintf(stderr,"total number of lost packets, measured in the receiving side: %i\n",perf.pktRcvLossTotal);
+    fprintf(stderr,"total number of retransmitted packets, measured in the sending side: %i\n",perf.pktRetransTotal);
+    fprintf(stderr,"total number of sent ACK packets: %i\n",perf.pktSentACKTotal);
+    fprintf(stderr,"total number of received ACK packets: %i\n",perf.pktRecvACKTotal);
+    fprintf(stderr,"total number of sent NAK packets: %i\n",perf.pktSentNAKTotal);
+    fprintf(stderr,"total number of received NAK packets: %i\n",perf.pktRecvNAKTotal);
+    fprintf(stderr,"round trip time: %fms\n",perf.msRTT);
       
   }*/
@@ -114 +114 @@
   char *buf = (char *)malloc(buf_size);
   if (!buf) {
-    printf("error malloc UdtSocket::receiveData buffer\n");
+    fprintf(stderr,"error malloc UdtSocket::receiveData buffer\n");
     return;
   }
   char *uncompressbuf=(char *)malloc(COMPRESS_CHUNK);
   if (!uncompressbuf) {
-    printf("error malloc UdtSocket::receiveData uncompress buffer\n");
+    fprintf(stderr,"error malloc UdtSocket::receiveData uncompress buffer\n");
     free(buf);
     return;
   }
-  //fprintf(stderr,"receiveData %x\n",thread());
+  //ffprintf(stderr,stderr,"receiveData %x\n",thread());
   
   while (!stop) {
@@ -135 +135 @@
     int eid = UDT::epoll_create();
     if (eid < 0) {
-      printf("%s: epoll_create error (%s)\n",name.toLocal8Bit().constData(),UDT::getlasterror().getErrorMessage());
+      fprintf(stderr,"%s: epoll_create error (%s)\n",name.toLocal8Bit().constData(),UDT::getlasterror().getErrorMessage());
     }
 
     if (UDT::epoll_add_usock(eid, socket) < 0) {
       if (UDT::getlasterror().getErrorCode() == 5004) {
-        printf("disconnected from %s\n",name.toLocal8Bit().constData());
+        fprintf(stderr,"disconnected from %s\n",name.toLocal8Bit().constData());
         heartbeat_timer->stop();
         deleteLater();
         stop=true;;
       } else {
-        printf("%s: epoll_add_usock error (%s)\n",name.toLocal8Bit().constData(),UDT::getlasterror().getErrorMessage());
+        fprintf(stderr,"%s: epoll_add_usock error (%s)\n",name.toLocal8Bit().constData(),UDT::getlasterror().getErrorMessage());
       }
     }
@@ -155 +155 @@
     if (rv == -1) {
       if (UDT::getlasterror().getErrorCode() != 6003)
-        printf("prob %i\n", UDT::getlasterror().getErrorCode());
+        fprintf(stderr,"prob %i\n", UDT::getlasterror().getErrorCode());
     } else if(readfds==socket && num==1 && rv==1) {
        
@@ -201 +201 @@
       } else {
         if(UDT::getlasterror().getErrorCode()!=6002) 
-          printf("udt socket:%s %i\n",UDT::getlasterror().getErrorMessage(),size);
+          fprintf(stderr,"udt socket: %s %i\n",UDT::getlasterror().getErrorMessage(),size);
         //UDT::close(socket);//si deconnecté
         //free(buf);
@@ -207 +207 @@
       }
     } else {
-      printf("udt socket:%s\n",UDT::getlasterror().getErrorMessage());
+      fprintf(stderr,"udt socket: %s\n",UDT::getlasterror().getErrorMessage());
     }
     UDT::epoll_remove_usock(eid, socket);
@@ -220 +220 @@
   qint64 sent = UDT::sendmsg(socket, buf, size, ttl, inOrder);
   if (sent != size) {
-    printf("%s, error writting to udt (%s)\n",name.toLocal8Bit().constData(), UDT::getlasterror().getErrorMessage());
+    fprintf(stderr,"%s, error writting to udt (%s)\n",name.toLocal8Bit().constData(), UDT::getlasterror().getErrorMessage());
     if (UDT::getlasterror().getErrorCode() == 2001) {
+      fprintf(stderr,"%s, closing connection\n",name.toLocal8Bit().constData());
       stop = true;
       heartbeat_timer->stop();