Changeset 15791

Timestamp:

Dec 12, 2007, 9:52:11 AM (18 years ago)

Author:

eugene

Message:

adding gprintSetFileAllThreads vs ThisThread

Location:

trunk/Ohana/src/opihi

Files:

• cmd.basic/output.c (modified) (3 diffs)
• include/shell.h (modified) (1 diff)
• lib.shell/gprint.c (modified) (2 diffs)
• pantasks/ListenClients.c (modified) (2 diffs)
• pantasks/controller_threads.c (modified) (1 diff)
• pantasks/input_threads.c (modified) (1 diff)
• pantasks/job_threads.c (modified) (1 diff)
• pantasks/pantasks_server.c.in (modified) (1 diff)
• pantasks/task_threads.c (modified) (1 diff)

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

@@ -31 +31 @@
   if ((N = get_argument (argc, argv, "-dump"))) {
     buffer = gprintGetBuffer (dest);
+    if (buffer == NULL) return (FALSE);
 
     /* save the current buffer contents */
@@ -39 +40 @@
     /* set the output target to the specified name */
     remove_argument (N, &argc, argv);
-    gprintSetFile (dest, argv[N]);
+    gprintSetFileAllThreads (dest, argv[N]);
     remove_argument (N, &argc, argv);
 
     /* send the output to the appropriate destination */
     gwrite (output, 1, Noutput, dest);
+    free (output);
     return (TRUE);
   }
@@ -52 +54 @@
   }
 
-  gprintSetFile (dest, argv[1]);
+  gprintSetFileAllThreads (dest, argv[1]);
   return (TRUE);
 }

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

@@ -152 +152 @@
 void          gprintSetBuffer           PROTO((gpDest dest));
 IOBuffer     *gprintGetBuffer           PROTO((gpDest dest));
-void          gprintSetFile             PROTO((gpDest dest, char *filename));
+void          gprintSetFileAllThreads   PROTO((gpDest dest, char *filename));
+void          gprintSetFileThisThread   PROTO((gpDest dest, char *filename));
+void          gprintSetFile             PROTO((gpStream *stream, gpDest dest, char *filename));
 FILE         *gprintGetFile             PROTO((gpDest dest));
 char         *gprintGetName             PROTO((gpDest dest));

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

@@ -126 +126 @@
 }
 
-void gprintSetFile (gpDest dest, char *filename) {
-
-  gpStream *stream;
-  stream = gprintGetStream (dest);
+void gprintSetFileAllThreads (gpDest dest, char *filename) {
+
+  int i;
+
+  for (i = 0; i < Nstreams; i++) {
+    if (streams[i].dest != dest) continue;
+    gprintSetFile (&streams[i], dest, filename);
+  }
+  return;
+}
+
+void gprintSetFileThisThread (gpDest dest, char *filename) {
+
+  gpStream *stream;
+  stream = gprintGetStream (dest);
+
+  gprintSetFile (stream, dest, filename);
+  return;
+}
+
+void gprintSetFile (gpStream *stream, gpDest dest, char *filename) {
 
   /* if we have an open buffer, free it and null it */
@@ -146 +163 @@
   }
 skip_close:
-  
-  free (stream[0].name);
+
+  // if NULL, reuse exising stream name
+  if (filename != NULL) {
+    free (stream[0].name);
+    stream[0].name = strcreate (filename);
+  }
 
   /* we allow the user to set stdout to ERR and stderr to LOG if they want */
-  if (!strcmp (filename, "stdout")) {
+  if (!strcmp (stream[0].name, "stdout")) {
     stream[0].file = stdout;
-    stream[0].name = strcreate (filename);
     goto skip_open;
   }
-  if (!strcmp (filename, "stderr")) {
+  if (!strcmp (stream[0].name, "stderr")) {
     stream[0].file = stderr;
-    stream[0].name = strcreate (filename);
     goto skip_open;
   }
   
   /* open the file */
-  stream[0].file = fopen (filename, "a");
+  stream[0].file = fopen (stream[0].name, "a");
   if (stream[0].file == NULL) {
-    fprintf (stderr, "cannot open file %s\n", filename);
+    fprintf (stderr, "cannot open file %s\n", stream[0].name);
+    free (stream[0].name);
     stream[0].file = (dest == GP_LOG) ? stdout : stderr;
     stream[0].name = (dest == GP_LOG) ? strcreate ("stdout") : strcreate("stderr");
-  } else {
-    stream[0].name = strcreate (filename);
   }
 
 skip_open:
   stream[0].mode = GP_FILE;
+  return;
 }
 

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

@@ -72 +72 @@
   // define server output log files
   if (VarConfig ("PANTASKS_SERVER_STDOUT", "%s", log_stdout) != NULL) {
-    gprintSetFile (GP_LOG, log_stdout);
+    gprintSetFileThisThread (GP_LOG, log_stdout);
   } else {
     strcpy (log_stdout, "stdout");
   }
   if (VarConfig ("PANTASKS_SERVER_STDERR", "%s", log_stderr) != NULL) {
-      gprintSetFile (GP_ERR, log_stderr);
+    gprintSetFileThisThread (GP_ERR, log_stderr);
   } else {
     strcpy (log_stderr, "stderr");
@@ -151 +151 @@
         // return the stderr messages first
         outbuffer = gprintGetBuffer (GP_ERR);
-        SendMessageFixed (clients[i], outbuffer[0].Nbuffer, outbuffer[0].buffer);
+        if (outbuffer) {
+          SendMessageFixed (clients[i], outbuffer[0].Nbuffer, outbuffer[0].buffer);
+        } else {
+          SendMessageFixed (clients[i], 0, "");
+        }         
 
         // return the stdout messages first
         outbuffer = gprintGetBuffer (GP_LOG);
-        SendMessageFixed (clients[i], outbuffer[0].Nbuffer, outbuffer[0].buffer);
+        if (outbuffer) {
+          SendMessageFixed (clients[i], outbuffer[0].Nbuffer, outbuffer[0].buffer);
+        } else {
+          SendMessageFixed (clients[i], 0, "");
+        }         
         
-        /* clear and reset the output buffers */
-        gprintSetFile (GP_LOG, log_stdout);
-        gprintSetFile (GP_ERR, log_stderr);
+        /* clear and reset the output buffers to their last output file names */
+        gprintSetFileAllThreads (GP_LOG, NULL);
+        gprintSetFileAllThreads (GP_ERR, NULL);
       }
       free (line);

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

@@ -19 +19 @@
   // define server output log files
   if (VarConfig ("PANTASKS_SERVER_STDOUT", "%s", log_stdout) != NULL) {
-      gprintSetFile (GP_LOG, log_stdout);
+      gprintSetFileThisThread (GP_LOG, log_stdout);
   }
   if (VarConfig ("PANTASKS_SERVER_STDERR", "%s", log_stderr) != NULL) {
-      gprintSetFile (GP_ERR, log_stderr);
+      gprintSetFileThisThread (GP_ERR, log_stderr);
   }
 

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

@@ -20 +20 @@
   // define server output log files
   if (VarConfig ("PANTASKS_SERVER_STDOUT", "%s", log_stdout) != NULL) {
-      gprintSetFile (GP_LOG, log_stdout);
+      gprintSetFileThisThread (GP_LOG, log_stdout);
   }
   if (VarConfig ("PANTASKS_SERVER_STDERR", "%s", log_stderr) != NULL) {
-      gprintSetFile (GP_ERR, log_stderr);
+      gprintSetFileThisThread (GP_ERR, log_stderr);
   }
 

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

@@ -21 +21 @@
   // define server output log files
   if (VarConfig ("PANTASKS_SERVER_STDOUT", "%s", log_stdout) != NULL) {
-      gprintSetFile (GP_LOG, log_stdout);
+      gprintSetFileThisThread (GP_LOG, log_stdout);
   }
   if (VarConfig ("PANTASKS_SERVER_STDERR", "%s", log_stderr) != NULL) {
-      gprintSetFile (GP_ERR, log_stderr);
+      gprintSetFileThisThread (GP_ERR, log_stderr);
   }
 

trunk/Ohana/src/opihi/pantasks/pantasks_server.c.in

@@ -29 +29 @@
   // define server output log files
   if (VarConfig ("PANTASKS_SERVER_STDOUT", "%s", log_stdout) != NULL) {
-      gprintSetFile (GP_LOG, log_stdout);
+      gprintSetFileThisThread (GP_LOG, log_stdout);
   }
   if (VarConfig ("PANTASKS_SERVER_STDERR", "%s", log_stderr) != NULL) {
-      gprintSetFile (GP_ERR, log_stderr);
+      gprintSetFileThisThread (GP_ERR, log_stderr);
   }
 

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

@@ -21 +21 @@
   // define server output log files
   if (VarConfig ("PANTASKS_SERVER_STDOUT", "%s", log_stdout) != NULL) {
-      gprintSetFile (GP_LOG, log_stdout);
+      gprintSetFileThisThread (GP_LOG, log_stdout);
   }
   if (VarConfig ("PANTASKS_SERVER_STDERR", "%s", log_stderr) != NULL) {
-      gprintSetFile (GP_ERR, log_stderr);
+      gprintSetFileThisThread (GP_ERR, log_stderr);
   }