Changeset 4706 for trunk/Ohana/src/opihi/pantasks

Timestamp:

Aug 4, 2005, 7:51:09 AM (21 years ago)

Author:

eugene

Message:

added test of exit/crash job stacks

Location:

trunk/Ohana/src/opihi/pantasks

Files:

• CheckController.c (added)
• CheckSystem.c (modified) (1 diff)
• ControllerOps.c (modified) (8 diffs)
• JobOps.c (modified) (1 diff)
• Makefile (modified) (1 diff)
• controller_check.c (modified) (1 diff)
• controller_host.c (modified) (1 diff)
• controller_status.c (modified) (1 diff)

trunk/Ohana/src/opihi/pantasks/CheckSystem.c

@@ -3 +3 @@
 int CheckSystem () {
 
+  /* need to make a timeout: if this process lasts too long, 
+     we should return so the user can get input in.  this cannot
+     just be a return, because we need to hit each of the elements
+     eventually
+  */
+
   CheckTasks ();
   CheckJobs ();
+  CheckController ();
   CheckControllerOutput ();
   return (TRUE);

trunk/Ohana/src/opihi/pantasks/ControllerOps.c

@@ -24 +24 @@
     GetJobOutput ("stdout", job[0].pid, &job[0].stdout, job[0].stdout_size);
     GetJobOutput ("stderr", job[0].pid, &job[0].stderr, job[0].stderr_size);
+    DeleteControllerJob (job);
   }  
   return (TRUE);
 }
 
+int DeleteControllerJob (Job *job) {
+
+  int status;
+  char cmd[128]; 
+  IOBuffer buffer;
+
+  sprintf (cmd, "delete %d", job[0].pid);
+  InitIOBuffer (&buffer, 0x100);
+  status = ControllerCommand (cmd, CONTROLLER_PROMPT, &buffer);
+  FreeIOBuffer (&buffer);
+  return (status);
+}
+  
 /* ask controller about job status */
 int CheckControllerJobStatus (Job *job) {
@@ -39 +53 @@
   InitIOBuffer (&buffer, 0x100);
   status = ControllerCommand (cmd, CONTROLLER_PROMPT, &buffer);
-
-  /* check on success of controller command */
-  switch (status) {
-    case CONTROLLER_DOWN:
-      if (VerboseMode()) fprintf (stderr, "controller is down\n");
-      FreeIOBuffer (&buffer);
-      return (FALSE);
-
-    case CONTROLLER_HUNG:
-      if (VerboseMode()) fprintf (stderr, "controller is not responding\n");
-      FreeIOBuffer (&buffer);
-      return (FALSE);
-
-    case CONTROLLER_GOOD:
-      if (VerboseMode()) fprintf (stderr, "message received (CheckControllerJobStatus)\n");
-      break;
-
-    default:
-      if (VerboseMode()) fprintf (stderr, "unknown status for controller command: programming error\n");  
-      exit (1);
+  if (!status) {
+    FreeIOBuffer (&buffer);
+    return (FALSE);
   }
 
@@ -137 +134 @@
 int SubmitControllerJob (Job *job) {
 
-  int i, Nchar;
+  int i, Nchar, status;
   char *cmd, *p, string[64];
   IOBuffer buffer;
@@ -177 +174 @@
 
   InitIOBuffer (&buffer, 0x100);
-  ControllerCommand (cmd, CONTROLLER_PROMPT, &buffer);
+  status = ControllerCommand (cmd, CONTROLLER_PROMPT, &buffer);
   free (cmd);
 
@@ -317 +314 @@
   /* send command, is pipe still open? */
   status = write_fmt (stdin_cntl, "%s\n", cmd);
-  if ((status == -1) && (errno == EPIPE)) return (CONTROLLER_DOWN);
+  if ((status == -1) && (errno == EPIPE)) {
+    ControllerStatus = FALSE;
+    if (VerboseMode()) fprintf (stderr, "controller is down\n");
+    return (FALSE);
+  }
   
   /* watch for response - wait up to 1 second */
@@ -329 +330 @@
   if (status ==  0) {
     ControllerStatus = FALSE;
-    return (CONTROLLER_DOWN);
-  }
-  if (status == -1) return (CONTROLLER_HUNG);
+    if (VerboseMode()) fprintf (stderr, "controller is down\n");
+    return (FALSE);
+  }
+  if (status == -1) {
+    if (VerboseMode()) fprintf (stderr, "controller is not responding\n");
+    return (FALSE);
+  }
 
   /* need to strip off the prompt */
@@ -339 +344 @@
     bzero (buffer[0].buffer + buffer[0].Nbuffer, buffer[0].Nalloc - buffer[0].Nbuffer);
   }
-  return (CONTROLLER_GOOD);
+  if (VerboseMode()) fprintf (stderr, "message received\n");
+  return (TRUE);
 }
 
@@ -396 +402 @@
   InitIOBuffer (&buffer, 0x100);
   status = ControllerCommand (cmd, CONTROLLER_PROMPT, &buffer);
+  FreeIOBuffer (&buffer);
+  return (status);
 
   /** need to interpret output message & free things **/
-  FreeIOBuffer (&buffer);
-  return (TRUE);
 }
 

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

@@ -172 +172 @@
     CheckLocalJob (job);
   } else {
-    CheckControllerJob (job);
+    /* controller jobs are now checked en masse by CheckController */
+    /* CheckControllerJob (job); */
   }
   return (job[0].state);

trunk/Ohana/src/opihi/pantasks/Makefile

@@ -30 +30 @@
 $(SDIR)/CheckJobs.$(ARCH).o \
 $(SDIR)/CheckSystem.$(ARCH).o \
+$(SDIR)/CheckController.$(ARCH).o \
 $(SDIR)/CheckTasks.$(ARCH).o \
 $(SDIR)/CheckTimeRanges.$(ARCH).o \

trunk/Ohana/src/opihi/pantasks/controller_check.c

@@ -27 +27 @@
   }
   FreeIOBuffer (&buffer);
-
-  /* check on success of controller command */
-  switch (status) {
-    case CONTROLLER_DOWN:
-      fprintf (stderr, "controller is down\n");
-      return (FALSE);
-
-    case CONTROLLER_HUNG:
-      fprintf (stderr, "controller is not responding\n");
-      return (FALSE);
-
-    case CONTROLLER_GOOD:
-      return (TRUE);
-
-    default:
-      fprintf (stderr, "unknown status for controller command: programming error\n");  
-      exit (1);
-  }
-
-  fprintf (stderr, "programming error: should not reach here\n");  
-  exit (1);
+  return (TRUE);
 
 usage:

trunk/Ohana/src/opihi/pantasks/controller_host.c

@@ -18 +18 @@
   InitIOBuffer (&buffer, 0x100);
   status = ControllerCommand (command, CONTROLLER_PROMPT, &buffer);
-  fwrite (buffer.buffer, 1, buffer.Nbuffer, stderr);
+  if (status) fwrite (buffer.buffer, 1, buffer.Nbuffer, stderr);
   FreeIOBuffer (&buffer);
 
-  /* check on success of controller command */
-  switch (status) {
-    case CONTROLLER_DOWN:
-      fprintf (stderr, "controller is down\n");
-      return (FALSE);
-
-    case CONTROLLER_HUNG:
-      fprintf (stderr, "controller is not responding\n");
-      return (FALSE);
-
-    case CONTROLLER_GOOD:
-      return (TRUE);
-
-    default:
-      fprintf (stderr, "unknown status for controller command: programming error\n");  
-      exit (1);
-  }
-
-  fprintf (stderr, "programming error: should not reach here\n");  
-  exit (1);
 }

trunk/Ohana/src/opihi/pantasks/controller_status.c

@@ -22 +22 @@
   InitIOBuffer (&buffer, 0x100);
   status = ControllerCommand (command, CONTROLLER_PROMPT, &buffer);
+  if (status) fwrite (buffer.buffer, 1, buffer.Nbuffer, stderr);
+  FreeIOBuffer (&buffer);
+  return (TRUE);
 
-  /* check on success of controller command */
-  switch (status) {
-    case CONTROLLER_DOWN:
-      fprintf (stderr, "controller is down\n");
-      FreeIOBuffer (&buffer);
-      return (FALSE);
-
-    case CONTROLLER_HUNG:
-      fprintf (stderr, "controller is not responding\n");
-      FreeIOBuffer (&buffer);
-      return (FALSE);
-
-    case CONTROLLER_GOOD:
-      fwrite (buffer.buffer, 1, buffer.Nbuffer, stderr);
-      FreeIOBuffer (&buffer);
-      return (TRUE);
-
-    default:
-      fprintf (stderr, "unknown status for controller command: programming error\n");  
-      exit (1);
-  }
-
-  fprintf (stderr, "programming error: should not reach here\n");  
-  exit (1);
 }