Changeset 4763 for trunk/Ohana/src/opihi/pcontrol/StopHosts.c

Timestamp:

Aug 14, 2005, 10:33:53 AM (21 years ago)

Author:

eugene

Message:

cleanup up communications for speed

File:

• trunk/Ohana/src/opihi/pcontrol/StopHosts.c (modified) (4 diffs)

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

@@ -29 +29 @@
 int StopHost (Host *host) {
 
-  int       result;
-  int       waitstatus;
   int       status;
   IOBuffer  buffer;
@@ -53 +51 @@
       exit (1);
   }
+  HarvestHost (host[0].pid);
+  return (TRUE);
+}
 
-  /* check current child status */
+void DownHost (Host *host) {
+  CLOSE (host[0].stdin);
+  CLOSE (host[0].stdout);
+  CLOSE (host[0].stderr);
+  host[0].job = NULL;
+  PutHost (host, PCONTROL_HOST_DOWN, STACK_BOTTOM);
+}
+
+void OffHost (Host *host) {
+  CLOSE (host[0].stdin);
+  CLOSE (host[0].stdout);
+  CLOSE (host[0].stderr);
+  host[0].job = NULL;
+  PutHost (host, PCONTROL_HOST_OFF, STACK_BOTTOM);
+}
+
+int HarvestHost (int pid) {
+  
+  int       result;
+  int       waitstatus;
+
   /* I probably should loop a few time with max timeout larger than 10ms... */
   usleep (10000);
-  result = waitpid (host[0].pid, &waitstatus, WNOHANG);
+  result = waitpid (pid, &waitstatus, WNOHANG);
   switch (result) {
     case -1:  /* error with waitpid */
@@ -83 +104 @@
 
     default:
-      if (result != host[0].pid) {
-        fprintf (stderr, "waitpid error: mis-matched PID (%d vs %d).  programming error\n", result, host[0].pid);
+      if (result != pid) {
+        fprintf (stderr, "waitpid error: mis-matched PID (%d vs %d).  programming error\n", result, pid);
         exit (1);
       }
@@ -101 +122 @@
   return (TRUE);
 }
-
-void DownHost (Host *host) {
-  CLOSE (host[0].stdin);
-  CLOSE (host[0].stdout);
-  CLOSE (host[0].stderr);
-  host[0].job = NULL;
-  PutHost (host, PCONTROL_HOST_DOWN, STACK_BOTTOM);
-}
-
-void OffHost (Host *host) {
-  CLOSE (host[0].stdin);
-  CLOSE (host[0].stdout);
-  CLOSE (host[0].stderr);
-  host[0].job = NULL;
-  PutHost (host, PCONTROL_HOST_OFF, STACK_BOTTOM);
-}