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

trunk/tools/FlairGCS/src/file_ui.cpp

@@ -34 +34 @@
   bool blocking = true;
   if (UDT::setsockopt(socket, 0, UDT_SNDSYN, &blocking, sizeof(bool))!= 0) {
-    printf("UDT::setsockopt error (UDT_SNDSYN) %s\n",UDT::getlasterror().getErrorMessage());
+    fprintf(stderr,"UDT::setsockopt error (UDT_SNDSYN) %s\n",UDT::getlasterror().getErrorMessage());
   }
     
@@ -42 +42 @@
   
   if (UDT::setsockopt(socket, 0, UDT_LINGER, &_linger, sizeof(struct linger)) != 0)
-    printf("UDT::setsockopt error (UDT_LINGER) %s\n",UDT::getlasterror().getErrorMessage());
+    fprintf(stderr,"UDT::setsockopt error (UDT_LINGER) %s\n",UDT::getlasterror().getErrorMessage());
     
   dialog = new QDialog();
-//fprintf(stderr,"creator file ui %x\n",thread());
+//ffprintf(stderr,stderr,"creator file ui %x\n",thread());
   dialog->setWindowTitle("log files");
   QGridLayout *main_layout = new QGridLayout(dialog);
@@ -86 +86 @@
   bool flag_new_seq = true;
   QString folder_name;
-//fprintf(stderr,"file_ui thread %x\n",thread());
+//ffprintf(stderr,stderr,"file_ui thread %x\n",thread());
   while(1) {
     // receive file info
@@ -101 +101 @@
       size = qFromBigEndian(size);
 
-    // printf("file_ui recu %i %x\n",bytesRead,recv_buf[0]);
+    // fprintf(stderr,"file_ui recu %i %x\n",bytesRead,recv_buf[0]);
     if ((recv_buf[0]==FILE_INFO_LITTLE_ENDIAN || recv_buf[0]==FILE_INFO_BIG_ENDIAN) && size>0) {
       if (flag_new_seq == true) {
@@ -148 +148 @@
       endOfFiles();
       UDT::close(socket);
-      printf("disconnected from log files\n");
+      fprintf(stderr,"disconnected from log files\n");
       break;
     }
@@ -221 +221 @@
     QString txt_line = txt_in.readLine();
     data_type.append(txt_line.section("(",-1)); // on part de la fin pour trouver la premiere parenthese ouvrante
-    // printf("type %s\n",txt_line.section("(",-1).toLocal8Bit().constData());
+    // fprintf(stderr,"type %s\n",txt_line.section("(",-1).toLocal8Bit().constData());
   }
   txt_file.close();
@@ -323 +323 @@
   QFile file(filename);
   if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
-    printf("file_ui::save_comment: erreur ouverture fichier %s\n",
+    fprintf(stderr,"file_ui::save_comment: erreur ouverture fichier %s\n",
            filename.toLocal8Bit().constData());
   QTextStream out(&file);
@@ -337 +337 @@
   QFile global_file(filename);
   if (!global_file.open(QIODevice::WriteOnly | QIODevice::Text))
-    printf("file_ui::save_csv: erreur ouverture fichier %s\n",
+    fprintf(stderr,"file_ui::save_csv: erreur ouverture fichier %s\n",
            filename.toLocal8Bit().constData());
   QTextStream out(&global_file);
@@ -344 +344 @@
   filename = file_names->at(csv_combo->currentIndex() - 1);
   QFile ref_file(filename);
-  // printf("file_ui::save_csv: ref %s\n",filename.toLocal8Bit().constData());
+  // fprintf(stderr,"file_ui::save_csv: ref %s\n",filename.toLocal8Bit().constData());
   if (!ref_file.open(QIODevice::ReadOnly | QIODevice::Text))
-    printf("file_ui::save_csv: erreur ouverture ficher %s\n",
+    fprintf(stderr,"file_ui::save_csv: erreur ouverture ficher %s\n",
            filename.toLocal8Bit().constData());
 
@@ -359 +359 @@
     m_file[j].setFileName(filename);
     if (!m_file[j].open(QIODevice::ReadOnly | QIODevice::Text))
-      printf("file_ui::save_csv: erreur ouverture ficher %s\n",
+      fprintf(stderr,"file_ui::save_csv: erreur ouverture ficher %s\n",
              filename.toLocal8Bit().constData());
     m_in[j].setDevice(&m_file[j]);
@@ -382 +382 @@
     qint64 ref_us = ref_line.section(',', 0, 0).toLongLong();
     int ref_ns = ref_line.section(',', 1, 1).toInt();
-    // printf("ref %lld %i\n",ref_us,ref_ns);
+    // fprintf(stderr,"ref %lld %i\n",ref_us,ref_ns);
 
     for (int i = 0; i < file_names->count() - 1; i++) {
       qint64 csv_us = m_line[i].section(',', 0, 0).toLongLong();
       int csv_ns = m_line[i].section(',', 1, 1).toInt();
-      // printf("m %lld %i\n",csv_us,csv_ns);
+      // fprintf(stderr,"m %lld %i\n",csv_us,csv_ns);
 
       while (is_greater(ref_us, csv_us, ref_ns, csv_ns) == true) {
@@ -396 +396 @@
         csv_us = m_line[i].section(',', 0, 0).toLongLong();
         csv_ns = m_line[i].section(',', 1, 1).toInt();
-        // printf("m %lld %i\n",csv_us,csv_ns);
+        // fprintf(stderr,"m %lld %i\n",csv_us,csv_ns);
       }
       csv_us = m_line_prev[i].section(',', 0, 0).toLongLong();
       csv_ns = m_line_prev[i].section(',', 1, 1).toInt();
-      // printf("m ok %lld %i\n",csv_us,csv_ns);
+      // fprintf(stderr,"m ok %lld %i\n",csv_us,csv_ns);
 
       ref_line += "," + m_line_prev[i].section(',', 2);
@@ -420 +420 @@
   QFile global_file(filename);
   if (!global_file.open(QIODevice::WriteOnly | QIODevice::Text))
-    printf("file_ui::save_txt: erreur ouverture ficher %s\n",
+    fprintf(stderr,"file_ui::save_txt: erreur ouverture ficher %s\n",
            filename.toLocal8Bit().constData());
   QTextStream out(&global_file);
@@ -429 +429 @@
   QFile ref_file(filename);
   if (!ref_file.open(QIODevice::ReadOnly | QIODevice::Text))
-    printf("file_ui::save_txt: erreur ouverture ficher %s\n",
+    fprintf(stderr,"file_ui::save_txt: erreur ouverture ficher %s\n",
            filename.toLocal8Bit().constData());
 
@@ -450 +450 @@
     QFile txt_file(filename);
     if (!txt_file.open(QIODevice::ReadOnly | QIODevice::Text))
-      printf("file_ui::save_txt: erreur ouverture ficher %s\n",
+      fprintf(stderr,"file_ui::save_txt: erreur ouverture ficher %s\n",
              filename.toLocal8Bit().constData());
     QTextStream txt_in(&txt_file);