Changeset 27839 for branches/simmosaic_branches/Ohana/src/opihi/pcontrol/StopHosts.c

Timestamp:

May 3, 2010, 8:45:22 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simmosaic_branches

Files:

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

branches/simmosaic_branches/Ohana/src/opihi/pcontrol/StopHosts.c

@@ -69 +69 @@
 }
 
-int StopHost (Host *host) {
+int StopHost (Host *host, int mode) {
 
   int       status;
 
-  status = PclientCommand (host, "exit", "Goodbye", PCONTROL_RESP_STOP_HOST);
+  switch (mode) {
+    case PCONTROL_HOST_DOWN:
+      status = PclientCommand (host, "exit", "Goodbye", PCONTROL_RESP_DOWN_HOST);
+      break;
+    case PCONTROL_HOST_OFF:
+      status = PclientCommand (host, "exit", "Goodbye", PCONTROL_RESP_STOP_HOST);
+      break;
+    default:
+      ABORT ("programming error: invalid StopHost mode");
+  }
 
   /* check on success of pclient command */
   switch (status) {
     case PCLIENT_DOWN:
-      // XXX this is the desired result in any case, so ignore it
-      break;
+      PutHost (host, PCONTROL_HOST_RESP, STACK_BOTTOM);
+      return (TRUE);
 
     case PCLIENT_GOOD:
@@ -100 +109 @@
 }
 
+int DownHostResponse (Host *host) {
+
+  DownHost (host);
+  HarvestHost (host[0].pid);
+  return (TRUE);
+}
+
 /* the host is thought to be down; check for child exit status */
 int HarvestHost (int pid) {
@@ -105 +121 @@
   int i, result, waitstatus;
 
-  if (VerboseMode()) gprint (GP_ERR, "harvesting within thread %p\n", pthread_self());
+#ifndef __APPLE__
+  if (VerboseMode()) gprint (GP_ERR, "harvesting within thread %lld\n", (long long) pthread_self());
+#endif
   if (VerboseMode()) gprint (GP_ERR, "child process %d is down, wait for exit status\n", pid);
   
@@ -134 +152 @@
       
     case 0:
-      gprint (GP_ERR, "child did not exit??");
-      abort ();
-      /** put back in IDLE state? **/
+      gprint (GP_ERR, "HarvestHost: child with connection to remote host failed to exit: may be hung");
       break;