Changeset 41483 for trunk/Ohana/src/opihi/pantasks/pantasks.c.in

Timestamp:

Feb 3, 2021, 2:12:35 PM (5 years ago)

Author:

eugene

Message:

stop threads before freeing data when QUIT is called; fuzz added to last task execution was not correctly added to usec -- this made fast tasks run many invalid attempts

File:

• trunk/Ohana/src/opihi/pantasks/pantasks.c.in (modified) (3 diffs)

trunk/Ohana/src/opihi/pantasks/pantasks.c.in

@@ -7 +7 @@
 # define opihi_rcfile ".pantasksrc"
 
+static pthread_t JobsAndTasksThread;
+static pthread_t controllerThread;
+
 /* program-dependent initialization */
 void program_init (int *argc, char **argv) {
@@ -12 +15 @@
   OHANA_UNUSED_PARAM(argv);
   
-  pthread_t JobsAndTasksThread;
-  pthread_t controllerThread;
-
   auto_break = TRUE;
 
@@ -67 +67 @@
 /* add program-dependent exit functions here */
 void cleanup () {
+  // stop the threads before calling the free functions
   QuitKapa ();
   QuitController ();
   ConfigFree ();
+
+  // tell the threads to exit and wait for them to exit
+  QuitJobsAndTasksThread(); pthread_join (JobsAndTasksThread, NULL);
+  QuitControllerThread(); pthread_join (controllerThread, NULL);
 
   FreeBasic ();