Changeset 8424 for trunk/Ohana/src/opihi/pcontrol/KillJob.c

Timestamp:

Aug 18, 2006, 1:44:51 PM (20 years ago)

Author:

eugene

Message:

successful implementation of the threaded version of pcontrol

File:

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

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

@@ -1 +1 @@
 # include "pcontrol.h"
 
-int KillJob (Job *job) {
+int KillJob (Job *job, Host *host) {
   
-  Host *host;
   IOBuffer buffer;
   int status;
   char *p;
 
-  /** must have a valid host : if not? **/
-  host = (Host *) job[0].host;
+  ASSERT (host == (Host *) job[0].host, "invalid host");
+  ASSERT (job  == (Job *) host[0].job, "invalid job");
 
   InitIOBuffer (&buffer, 0x100);
@@ -19 +18 @@
     case PCLIENT_DOWN:
       HarvestHost (host[0].pid);
-      UnlinkJobAndHost (job);
-      PutJob (job, PCONTROL_JOB_PENDING, STACK_BOTTOM);
+      // unlink host & job
+      job[0].host = NULL;
+      host[0].job = NULL;
       PutHost (host, PCONTROL_HOST_DOWN, STACK_BOTTOM);
+      PutJob (job, PCONTROL_JOB_CRASH, STACK_BOTTOM);
       FreeIOBuffer (&buffer);
       return (FALSE);
 
     case PCLIENT_HUNG:
+      HarvestHost (host[0].pid);
+      // unlink host & job
+      job[0].host = NULL;
+      host[0].job = NULL;
+      PutHost (host, PCONTROL_HOST_DOWN, STACK_BOTTOM);
       PutJobSetState (job, PCONTROL_JOB_BUSY, STACK_BOTTOM, PCONTROL_JOB_HUNG);
       FreeIOBuffer (&buffer);
@@ -31 +37 @@
 
     case PCLIENT_GOOD:
-      gprint (GP_ERR, "message received (KillJob)\n");  
+      if (VerboseMode()) gprint (GP_ERR, "message received (KillJob)\n");  
       break;
 
     default:
-      gprint (GP_ERR, "unknown status for pclient command: programming error\n");  
-      exit (1);
+      ABORT ("unknown status for pclient command");  
   }
 
   /** host is up, need to parse message **/
   p = memstr (buffer.buffer, "STATUS", buffer.Nbuffer);
-  if (p == NULL) {
-    gprint (GP_ERR, "missing STATUS in pclient message : programming error\n");
-    exit (1);
-  }
-  gprint (GP_ERR, "client message: %s\n", buffer.buffer);
+  ASSERT (p != NULL, "missing STATUS in pclient message");
+  if (VerboseMode()) gprint (GP_ERR, "client message: %s\n", buffer.buffer);
+
   sscanf (p, "%*s %d", &status);
   FreeIOBuffer (&buffer);
@@ -52 +55 @@
   switch (status) {
     case -1:
-      gprint (GP_ERR, "programming error (syntax error to pclient)\n");
-      return (FALSE);
-      break;
+      ABORT ("syntax error to pclient");
     case 0:
       gprint (GP_ERR, "failure to kill child process\n");
-      PutJob (job, PCONTROL_JOB_BUSY, STACK_BOTTOM);
+      PutHost (host, PCONTROL_HOST_BUSY, STACK_BOTTOM);
+      PutJob (job, PCONTROL_JOB_KILL, STACK_BOTTOM);
       return (FALSE);
     case 1:
-      PutJobSetState (job, PCONTROL_JOB_DONE, STACK_BOTTOM, PCONTROL_JOB_CRASH);
+      gprint (GP_ERR, "killing job %s on %s\n", job[0].argv[0], host[0].hostname);
+      // unlink host & job
+      job[0].host = NULL;
+      host[0].job = NULL;
+      PutHost (host, PCONTROL_HOST_IDLE, STACK_BOTTOM);
+      PutJob (job, PCONTROL_JOB_CRASH, STACK_BOTTOM);
       return (TRUE);
     case 2:
-      gprint (GP_ERR, "programming error (client has no job)\n");
-      return (FALSE);
+      ABORT ("client has no job");
   }
-
-  gprint (GP_ERR, "programming error : should not reach here (CheckJob)\n");
-  exit (1);
+  ABORT ("should not reach here (KillJob)");
 }
-
-/** XXX need to do something appropriate with host? ***/