Changeset 41483 for trunk/Ohana/src/opihi/pantasks/pantasks_server.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_server.c.in (modified) (3 diffs)

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

@@ -15 +15 @@
 void special_init (int *argc, char **argv);
 
+static pthread_t JobsAndTasksThread;
+static pthread_t controllerThread;
+static pthread_t clientsThread;
+
 /* program-dependent initialization */
 int main (int argc, char **argv) {
@@ -20 +24 @@
   char hostname[256], portinfo[256];
   char log_stdout[1024], log_stderr[1024], tmpname[1024];
-  pthread_t JobsAndTasksThread;
-  pthread_t clientsThread;
-  pthread_t controllerThread;
   int InitSocket, BindSocket;
   SockAddress Address;
@@ -136 +137 @@
   QuitController ();
   ConfigFree ();
+
+  QuitJobsAndTasksThread(); pthread_join (JobsAndTasksThread, NULL);
+  QuitControllerThread();   pthread_join (controllerThread, NULL);
+  QuitClientThread();       pthread_join (clientsThread, NULL);
+
   InitBasic ();
   InitData ();