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

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/pantasks

Files:

• ControllerOps.c (modified) (1 diff)
• Makefile (modified) (1 diff)
• controller.c (modified) (2 diffs)
• controller_jobstack.c (modified) (1 diff)
• controller_output.c (modified) (2 diffs)
• controller_verbose.c (added)

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);
 }