Changeset 13720

Timestamp:

Jun 8, 2007, 11:41:36 AM (19 years ago)

Author:

eugene

Message:

catching unexpected exit calls

Location:

trunk/Ohana/src/opihi/pcontrol

Files:

• GetJobOutput.c (modified) (1 diff)
• HostOps.c (modified) (2 diffs)
• JobOps.c (modified) (2 diffs)
• ResetJob.c (modified) (1 diff)
• StopHosts.c (modified) (3 diffs)
• pcontrol.c.in (modified) (1 diff)
• rconnect.c (modified) (3 diffs)

trunk/Ohana/src/opihi/pcontrol/GetJobOutput.c

@@ -62 +62 @@
 
   gprint (GP_ERR, "programming error: should not reach here (GetJobOutput)\n");
-  exit (1);
+  pcontrol_exit (1);
 }

trunk/Ohana/src/opihi/pcontrol/HostOps.c

@@ -24 +24 @@
   }
   gprint (GP_ERR, "error: unknown host stack : programming error\n");
-  exit (1);
+  pcontrol_exit (1);
 }
 
@@ -36 +36 @@
   }
   gprint (GP_ERR, "error: unknown host stack : programming error\n");
-  exit (1);
+  pcontrol_exit (1);
 }
 

trunk/Ohana/src/opihi/pcontrol/JobOps.c

@@ -27 +27 @@
   }
   gprint (GP_ERR, "error: unknown host stack : programming error\n");
-  exit (1);
+  pcontrol_exit (1);
 }
 
@@ -40 +40 @@
   }
   gprint (GP_ERR, "error: unknown job stack : programming error\n");
-  exit (1);
+  pcontrol_exit (1);
 }
 

trunk/Ohana/src/opihi/pcontrol/ResetJob.c

@@ -43 +43 @@
     default:
       gprint (GP_ERR, "unknown status for pclient command: programming error\n");  
-      exit (1);
+      pcontrol_exit (1);
   }
 
   gprint (GP_ERR, "programming error in GetJobOutput (should not reach here)\n");
-  exit (1);
+  pcontrol_exit (1);
 }
 

trunk/Ohana/src/opihi/pcontrol/StopHosts.c

@@ -91 +91 @@
     default:
       gprint (GP_ERR, "unknown status for pclient command: programming error\n");  
-      exit (1);
+      pcontrol_exit (1);
   }
   HarvestHost (host[0].pid);
@@ -139 +139 @@
       if (result != pid) {
         gprint (GP_ERR, "waitpid error: mis-matched PID (%d vs %d).  programming error\n", result, pid);
-        exit (1);
+        pcontrol_exit (1);
       }
       
@@ -149 +149 @@
       }
       if (WIFSTOPPED(waitstatus)) {
-        if (VerboseMode()) gprint (GP_ERR, "waitpid returns 'stopped': programming error\n");
-        exit (1);
+        gprint (GP_ERR, "waitpid returns 'stopped': programming error\n");
+        pcontrol_exit (1);
       }
   }

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

@@ -85 +85 @@
   int status;
   status = opihi (argc, argv);
+  abort ();     
   exit (status);
 }
+
+void pcontrol_exit (int n) {
+  abort ();
+  exit (n);
+}

trunk/Ohana/src/opihi/pcontrol/rconnect.c

@@ -58 +58 @@
     status = execvp (argv[0], argv); 
     gprint (GP_ERR, "error starting remote shell process\n");
-    exit (1);
+    pcontrol_exit (1);
   }
   free (argv);
@@ -122 +122 @@
   if ((result == -1) && (errno != ECHILD)) {
     gprint (GP_ERR, "unexpected error from waitpid (%d): programming error\n", errno);
-    exit (1);
+    pcontrol_exit (1);
   }
   if (result == 0) {
@@ -130 +130 @@
     if (result != pid) {
       gprint (GP_ERR, "waitpid error: mis-matched PID (%d vs %d).  programming error\n", result, pid);
-      exit (1);
+      pcontrol_exit (1);
     }
     if (WIFSTOPPED(waitstatus)) {
       gprint (GP_ERR, "waitpid returns 'stopped': programming error\n");
-      exit (1);
+      pcontrol_exit (1);
     }
   }