Changeset 27255 for trunk/Ohana

Timestamp:

Mar 11, 2010, 12:45:59 PM (16 years ago)

Author:

eugene

Message:

add shell-verbosity (echo commmand lines) and function to enable; add fflush calls to gprint

Location:

trunk/Ohana/src/opihi

Files:

• cmd.basic/Makefile (modified) (1 diff)
• cmd.basic/init.c (modified) (2 diffs)
• cmd.basic/opihi.c (added)
• include/shell.h (modified) (1 diff)
• lib.shell/command.c (modified) (4 diffs)
• lib.shell/gprint.c (modified) (2 diffs)
• pantasks/test/threadload.sh (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.basic/Makefile

@@ -40 +40 @@
 $(SRC)/module.$(ARCH).o     \
 $(SRC)/nop.$(ARCH).o        \
+$(SRC)/opihi.$(ARCH).o     \
 $(SRC)/output.$(ARCH).o     \
 $(SRC)/quit.$(ARCH).o        \

trunk/Ohana/src/opihi/cmd.basic/init.c

@@ -26 +26 @@
 int module          PROTO((int, char **));
 int nop             PROTO((int, char **));
+int opihi_setmode   PROTO((int, char **));
 int output          PROTO((int, char **));
 int pwd             PROTO((int, char **));
@@ -74 +75 @@
   {1, "module",        module,             "load script file from the modules directories"},
   {1, "nop",           nop,                "a NOP function"},
+  {1, "opihi",         opihi_setmode,      "get / set opihi behavior options"},
   {1, "output",        output,             "redirect output to file"},
   {1, "pwd",           pwd,                "print current working directory"},

trunk/Ohana/src/opihi/include/shell.h

@@ -70 +70 @@
 
 int           command                   PROTO((char *line, char **outline, int VERBOSE));
+void          set_verbose_shell         PROTO((int mode));
+int           get_verbose_shell         PROTO((void));
+
 char         *expand_vars               PROTO((char *line));
 char         *expand_vectors            PROTO((char *line));

trunk/Ohana/src/opihi/lib.shell/command.c

@@ -1 +1 @@
 # include "opihi.h"
 # define DEBUG 0
+
+static int VERBOSE_SHELL = FALSE;
 
 int command (char *line, char **outline, int VERBOSE) {
@@ -29 +31 @@
   *outline = line;
   
-  # if (DEBUG) 
-  fprintf (stderr, "line: %s\n", line);
-  # endif
+  if (VERBOSE_SHELL) gprint (GP_ERR, "opihi: %s\n", line);
 
   argv = parse_commands (line, &argc);
@@ -60 +60 @@
     msg = get_variable_ptr ("ERRORMSG");
     if (msg != (char *) NULL) gprint (GP_ERR, "%s\n", msg);
-    // gprint (GP_ERR, "error on line: %s\n", rawline);
+    if (VERBOSE_SHELL) gprint (GP_ERR, "error on line: %s\n", rawline);
   }
 
@@ -73 +73 @@
 }
 
+void set_verbose_shell(int mode) {
+    VERBOSE_SHELL = mode;
+}
+
+int get_verbose_shell(void) {
+    return VERBOSE_SHELL;
+}
+
+    
+
 /* parse the input line, search for the corresponding command, and execute it
    if no match is found, return -1; this is used above to distinguish between

trunk/Ohana/src/opihi/lib.shell/gprint.c

@@ -305 +305 @@
   if (stream[0].mode == GP_FILE) {
     status = vfprintf (stream[0].file, format, argp);
+    fflush (stream[0].file);
     if (status < 0) {
       return (FALSE);
@@ -325 +326 @@
   if (stream[0].mode == GP_FILE) {
     fwrite (buffer, size, N, stream[0].file);
+    fflush (stream[0].file);
   } else {
     // XXX can we not use exising IOBuffer APIs here?

trunk/Ohana/src/opihi/pantasks/test/threadload.sh

@@ -31 +31 @@
   # default exit status
   task.exit    default
-    echo       "basic: exit status: $EXIT"
+    echo       "basic: exit status: $JOB_STATUS"
   end
 
@@ -65 +65 @@
   # default exit status
   task.exit    default
-    echo       "basic: exit status: $EXIT"
+    echo       "basic: exit status: $JOB_STATUS"
   end
 
@@ -99 +99 @@
   # default exit status
   task.exit    default
-    echo       "basic: exit status: $EXIT"
+    echo       "basic: exit status: $JOB_STATUS"
   end