Changeset 362 in flair-src for trunk/lib/FlairCore

Timestamp:

Jul 23, 2020, 4:45:20 PM (4 years ago)

Author:

Sanahuja Guillaume

Message:

stop all threads then delete them

File:

• trunk/lib/FlairCore/src/FrameworkManager.cpp (modified) (2 diffs)

trunk/lib/FlairCore/src/FrameworkManager.cpp

@@ -75 +75 @@
     getUiCom()->Join();
   }
-
+/*
+//stop and delete each thread has been changed to stop all thread, then delete all threads
+//seems ok but needs more testing
+ *
   // we start by deleting threads (except pimpl which must be deleted at last)
   // (before deleting objects that could be used by the threads)
@@ -97 +100 @@
     }
   }
-
+*/
+  // we start by stopping threads (except pimpl which must be deleted at last)
+  // (before deleting objects that could be used by the threads)
+  //Printf("stop Threads\n");
+  for (vector<const Object *>::iterator it = Childs()->begin();it < Childs()->end(); it++) {
+     //Printf("child %i %s %s\n",Childs()->size(),(*it)->ObjectName().c_str(),(*it)->ObjectType().c_str());
+    if ((*it)->ObjectType() == "Thread") {
+      if (*it != pimpl_) {
+         //Printf("stop\n");
+        ((Thread *)(*it))->SafeStop();
+        ((Thread *)(*it))->Join();
+         //Printf("stop ok\n");
+      }
+    }
+  }
+  //then delete threads
+    //Printf("del Threads\n");
+  for (vector<const Object *>::iterator it = Childs()->begin();it < Childs()->end(); it++) {
+     //Printf("child %i %s %s\n",Childs()->size(),(*it)->ObjectName().c_str(),(*it)->ObjectType().c_str());
+    if ((*it)->ObjectType() == "Thread") {
+      if (*it != pimpl_) {
+        // Printf("del\n");
+        delete (Thread *)(*it);
+        // Childs() vector has been modified, we start from beginning again
+        // it will be incremented by the loop, so in fact we start again at
+        // begin()+1
+        // it is not a problem since begin is pimpl
+        it = Childs()->begin();
+        //Printf("del ok\n");
+      }
+    }
+  }
+  
   // next we delete IODevice
   // (before deleting objects that could be used by the IODevice)