Changeset 18085

Timestamp:

Jun 11, 2008, 3:34:27 PM (18 years ago)

Author:

eugene

Message:

adding controller verbose, fix jobstack crash; start virtual job list

Location:

trunk/Ohana/src/opihi

Files:

• pantasks/ControllerOps.c (modified) (1 diff)
• pantasks/Makefile (modified) (1 diff)
• pantasks/controller.c (modified) (2 diffs)
• pantasks/controller_jobstack.c (modified) (1 diff)
• pantasks/controller_output.c (modified) (2 diffs)
• pantasks/controller_verbose.c (added)
• pcontrol/JobOps.c (modified) (7 diffs)

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

@@ -445 +445 @@
 }
 
+int FlushControllerOutput () {
+
+  FlushIOBuffer (&stdout_buffer);
+  FlushIOBuffer (&stderr_buffer);
+
+  return (TRUE);
+}
 
 int KillControllerJob (Job *job) {

trunk/Ohana/src/opihi/pantasks/Makefile

@@ -79 +79 @@
 $(SRC)/controller_status.$(ARCH).o \
 $(SRC)/controller_jobstack.$(ARCH).o \
+$(SRC)/controller_verbose.$(ARCH).o \
 $(SRC)/controller_run.$(ARCH).o \
 $(SRC)/controller_output.$(ARCH).o \

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

@@ -5 +5 @@
 int controller_status   PROTO((int, char **));
 int controller_jobstack PROTO((int, char **));
+int controller_verbose  PROTO((int, char **));
 int controller_run      PROTO((int, char **));
 int controller_stop     PROTO((int, char **));
@@ -19 +20 @@
   {1, "status",   controller_status,   "check controller status"},
   {1, "jobstack", controller_jobstack, "check controller status"},
+  {1, "verbose",  controller_verbose,  "set controller verbosity"},
   {1, "output",   controller_output,   "print controller output"},
   {1, "pulse",    controller_pulse,    "set controller pulse"},

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

@@ -21 +21 @@
 
   // XXX this has an error?  test this out...
-  sprintf (command, "jobstack %s", argv[2]);
+  sprintf (command, "jobstack %s", argv[1]);
   InitIOBuffer (&buffer, 0x100);
 

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

@@ -3 +3 @@
 int controller_output (int argc, char **argv) {
 
-  if (argc != 1) {
-    gprint (GP_ERR, "USAGE: controller status\n");
+  if ((argc != 1) || ((argc == 2) && (strcmp(argv[1], "flush")))) {
+    gprint (GP_ERR, "USAGE: controller output\n");
     return (FALSE);
   }
@@ -10 +10 @@
   CheckControllerOutput ();
   PrintControllerOutput ();
+
+  if (argc == 2) {
+    FlushControllerOutput ();
+  }
+
   return (TRUE);
 }

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

@@ -1 +1 @@
 # include "pcontrol.h"
+
+// Stack *JobPool_AllJobs;
 
 Stack *JobPool_Pending;
@@ -10 +12 @@
 
 void InitJobStacks () {
+  // JobPool_AllJobs = InitStack ();
+
   JobPool_Pending = InitStack ();
   JobPool_Busy    = InitStack ();
@@ -28 +32 @@
 
 void FreeJobStacks () {
+
+  // AllJobs is a virtual stack : all jobs are references
+  // FreeStack (JobPool_AllJobs);
+
   FreeJobStack (JobPool_Pending);
   FreeJobStack (JobPool_Busy   );
@@ -39 +47 @@
 char *GetJobStackName (int StackID) {
   switch (StackID) {
+    // case PCONTROL_JOB_ALLJOBS: return ("ALLJOBS");
+
     case PCONTROL_JOB_PENDING: return ("PENDING");
     case PCONTROL_JOB_BUSY:    return ("BUSY");
@@ -54 +64 @@
 Stack *GetJobStack (int StackID) {
   switch (StackID) {
+    // case PCONTROL_JOB_ALLJOBS: return (JobPool_AllJobs);
+
     case PCONTROL_JOB_PENDING: return (JobPool_Pending);
     case PCONTROL_JOB_BUSY:    return (JobPool_Busy);
@@ -68 +80 @@
 
 Stack *GetJobStackByName (char *name) {
+
+  // if (!strcasecmp (name, "all"))     return (JobPool_AllJobs);
 
   if (!strcasecmp (name, "pending")) return (JobPool_Pending);
@@ -183 +197 @@
 
   JobID = job[0].JobID;
+
   PutJob (job, PCONTROL_JOB_PENDING, STACK_BOTTOM);
+  // PutJob (job, PCONTROL_JOB_ALLJOBS, STACK_BOTTOM);
+
   if (VerboseMode()) gprint (GP_ERR, "added new job\n");
   return (JobID);