Changeset 17476 for trunk/Ohana/src/opihi/pcontrol/CheckRespHost.c

Timestamp:

Apr 23, 2008, 1:17:40 PM (18 years ago)

Author:

eugene

Message:

fixed up the pcontrol / pclient interactions

File:

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

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

@@ -28 +28 @@
       }
 
+      // clear the response data
+      host[0].response_state = PCONTROL_RESP_NONE;
+      host[0].response = NULL;
+
       // host has shutdown; harvest the defunct process
       HarvestHost (host[0].pid);
@@ -37 +41 @@
       PutHost (host, PCONTROL_HOST_RESP, STACK_BOTTOM);
       if (job) {
-        PutJob (job, PCONTROL_JOB_BUSY, STACK_BOTTOM);
+        PutJob (job, PCONTROL_JOB_RESP, STACK_BOTTOM);
       }
       if (DEBUG || VerboseMode()) gprint (GP_ERR, "host %s is not responding\n", host[0].hostname);
@@ -52 +56 @@
   switch (host[0].response_state) {
     case PCONTROL_RESP_START_JOB:
+      if (DEBUG) fprintf (stderr, "PCONTROL_RESP_START_JOB\n");
       status = StartJobResponse (host);
-      return (status);
+      break;
 
     case PCONTROL_RESP_CHECK_HOST:
+      if (DEBUG) fprintf (stderr, "PCONTROL_RESP_CHECK_HOST\n");
       status = CheckHostResponse (host);
-      return (status);
+      break;
 
     case PCONTROL_RESP_CHECK_DONE_HOST:
+      if (DEBUG) fprintf (stderr, "PCONTROL_RESP_CHECK_DONE_HOST\n");
       status = CheckDoneHostResponse (host);
-      return (status);
+      break;
 
     case PCONTROL_RESP_CHECK_BUSY_JOB:
+      if (DEBUG) fprintf (stderr, "PCONTROL_RESP_BUSY_JOB\n");
       status = CheckBusyJobResponse (host);
-      return (status);
+      break;
 
     case PCONTROL_RESP_KILL_JOB:
+      if (DEBUG) fprintf (stderr, "PCONTROL_RESP_KILL_JOB\n");
       status = KillJobResponse (host);
-      return (status);
+      break;
 
     case PCONTROL_RESP_STOP_HOST:
+      if (DEBUG) fprintf (stderr, "PCONTROL_RESP_STOP_HOST\n");
       status = StopHostResponse (host);
-      return (status);
+      break;
 
     default:
@@ -79 +89 @@
   }
 
-  ABORT ("should not be able to get here");
+  // we have detected a valid response, clear the response data
+  host[0].response_state = PCONTROL_RESP_NONE;
+  host[0].response = NULL;
+  return (status);
 }