Changeset 42173

Timestamp:

Apr 18, 2022, 10:26:42 AM (4 years ago)

Author:

eugene

Message:

stop pcontrol threads and exit before shutting down

Location:

branches/eam_branches/ipp-20220316/Ohana/src/opihi

Files:

• include/pcontrol.h (modified) (1 diff)
• pcontrol/CheckSystem.c (modified) (2 diffs)
• pcontrol/pcontrol.c.in (modified) (3 diffs)
• pcontrol/test/linesize.sh (modified) (2 diffs)

branches/eam_branches/ipp-20220316/Ohana/src/opihi/include/pcontrol.h

@@ -341 +341 @@
 
 void pcontrol_exit (int n);
+void QuitCheckSystemThread (void);
 
 // Job   *FindJobByID (IDtype JobID, int *StackID);

branches/eam_branches/ipp-20220316/Ohana/src/opihi/pcontrol/CheckSystem.c

@@ -4 +4 @@
 static struct timeval lastlive = {0, 0};
 static RunLevels RunLevel = PCONTROL_RUN_NONE;
+
+static int CheckSystemThreadRuns = TRUE;
+
+void QuitCheckSystemThread (void) {
+  CheckSystemThreadRuns = FALSE;  
+}
+
 
 RunLevels SetRunLevel (RunLevels level) {
@@ -67 +74 @@
   gprintInit ();
 
-  while (1) {
+  while (CheckSystemThreadRuns) {
     // stop here if the user-thread requests (no objects in flight) 
     TestCheckPoint ();

branches/eam_branches/ipp-20220316/Ohana/src/opihi/pcontrol/pcontrol.c.in

@@ -9 +9 @@
 # define opihi_rcfile ".pcontrolrc"
 
+# ifdef THREADED  
+  static pthread_t clientsThread;
+# endif
+
 /* program-dependent initialization */
 void program_init (int *argc, char **argv) {
@@ -14 +18 @@
   OHANA_UNUSED_PARAM(argv);
   
-# ifdef THREADED  
-  pthread_t clientsThread;
-# endif
-
   auto_break = TRUE;
 
@@ -83 +83 @@
   SetRunLevel (PCONTROL_RUN_HOSTS); 
   DownHosts ();
+
+  QuitCheckSystemThread(); pthread_join (clientsThread, NULL);
+
   ConfigFree ();
-
   FreeBasic ();
   FreePcontrol ();

branches/eam_branches/ipp-20220316/Ohana/src/opihi/pcontrol/test/linesize.sh

@@ -27 +27 @@
 
   for i 1 10
-    job echo $inline7
+    job echo $inline6
   end
 
@@ -34 +34 @@
   for i 1 10
     stdout $i -var outline
-    strlen "$inline7" Nin
+    strlen "$inline6" Nin
     strlen "$outline" Nout