Changeset 4944 for trunk/psLib/src

Timestamp:

Sep 2, 2005, 11:32:06 AM (21 years ago)

Author:

drobbin

Message:

made requested changes including using file descriptors in psTrace

Location:

trunk/psLib/src

Files:

• astro/psTime.c (modified) (3 diffs)
• astro/psTime.h (modified) (2 diffs)
• math/psMinimize.c (modified) (2 diffs)
• mathtypes/psImage.c (modified) (3 diffs)
• mathtypes/psImage.h (modified) (2 diffs)
• mathtypes/psVector.c (modified) (3 diffs)
• mathtypes/psVector.h (modified) (2 diffs)
• sys/psTrace.c (modified) (3 diffs)
• sys/psTrace.h (modified) (3 diffs)

trunk/psLib/src/astro/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-31 22:28:35 $
+ *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-02 21:32:03 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1360 +1360 @@
 }
 
-psTime* psTimeFromISO(const char *input)
+psTime* psTimeFromISO(const char *input,
+                      psTimeType type)
 {
     psS32 millisecond;
@@ -1391 +1392 @@
     outTime = p_psTimeFromTM(&tmTime);
     outTime->nsec = millisecond * 1000000;
+    outTime->type = type;
 
     return outTime;

trunk/psLib/src/astro/psTime.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-31 22:28:35 $
+ *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-02 21:32:03 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -281 +281 @@
  */
 psTime* psTimeFromISO(
-    const char* input                  ///< Input time to be converted.
+    const char* input,                 ///< Input time to be converted.
+    psTimeType type                    ///< Time type.
 );
 

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.132 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-30 01:14:13 $
+ *  @version $Revision: 1.133 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-02 21:32:06 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -2192 +2192 @@
 
     if (psTraceGetLevel (".psLib.dataManip.VectorFitPolynomial1DOrd") >= 5) {
-        FILE *f = psTraceGetDestination ();
+        FILE *f = fdopen((psTraceGetDestination ()), "a+");
         fprintf (f, "VectorFitPolynomial1D()\n");
         for (int i = 0; i < x->n; i++) {
             fprintf (f, "(x, y, yErr) is (%f, %f, %f)\n", x->data.F64[i], y->data.F64[i], yErr->data.F64[i]);
         }
+        fclose(f);
     }
 

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.79 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-31 02:07:11 $
+ *  @version $Revision: 1.80 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-02 21:32:06 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -473 +473 @@
 }
 
-bool p_psImagePrint (FILE *f, psImage *a, char *name)
-{
-
+bool p_psImagePrint (int fd, psImage *a, char *name)
+{
+    FILE *f;
+    f = fdopen(fd, "a+");
     fprintf (f, "matrix: %s\n", name);
 
@@ -485 +486 @@
     }
     fprintf (f, "\n");
+    fclose(f);
     return (true);
 }

trunk/psLib/src/mathtypes/psImage.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-31 02:07:11 $
+ *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-02 21:32:06 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -239 +239 @@
  */
 bool p_psImagePrint(
-    FILE *f,                           ///< Destination stream
+    int fd,                            ///< Destination file descriptor
     psImage *a,                        ///< image to print
     char *name                         ///< name of the image (for title)

trunk/psLib/src/mathtypes/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-08-30 01:14:13 $
+*  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-02 21:32:06 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -599 +599 @@
 }
 
-bool p_psVectorPrint (FILE *f,
+bool p_psVectorPrint (int fd,
                       psVector *a,
                       char *name)
 {
-
+    FILE *f;
+    f = fdopen(fd, "a+");
     fprintf (f, "vector: %s\n", name);
 
@@ -610 +611 @@
     }
     fprintf (f, "\n");
+    fclose(f);
     return (true);
 }

trunk/psLib/src/mathtypes/psVector.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-30 01:14:13 $
+ *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-02 21:32:06 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -192 +192 @@
  */
 bool p_psVectorPrint (
-    FILE *f,                           ///< output stream
+    int fd,                            ///< output file descriptor
     psVector *a,                       ///< vector to print
     char *name                         ///< name of vector (for title)

trunk/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-18 20:54:22 $
+ *  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-02 21:32:06 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -55 +55 @@
 static p_psComponent* cRoot = NULL; // The root of the trace component
 static FILE *traceFP = NULL;        // File destination for messages.
+//static int traceFD = 0;
 
 static void componentFree(p_psComponent* comp);
@@ -525 +526 @@
 
 // XXX EAM : I've added code to close the old traceFP (safely)
-void psTraceSetDestination(FILE * fp)
-{
-
-    bool special;
-
-    // XXX EAM perhaps return an error?
-    if (fp == NULL) {
+void psTraceSetDestination(int fd)
+{
+
+
+    /*
+        bool special;
+     
+        // XXX EAM perhaps return an error?
+        if (fp == NULL) {
+            return;
+        }
+     
+        // cannot close traceFP if one of the special FILE ptrs
+        special  = (traceFP == NULL);
+        special |= (traceFP == stdin);
+        special |= (traceFP == stdout);
+        special |= (traceFP == stderr);
+     
+        if (!special) {
+            fclose (traceFP);
+        }
+        traceFP = fp;
+    */
+    if (fd == -1) {
         return;
     }
-
-    // cannot close traceFP if one of the special FILE ptrs
-    special  = (traceFP == NULL);
-    special |= (traceFP == stdin);
-    special |= (traceFP == stdout);
-    special |= (traceFP == stderr);
-
-    if (!special) {
-        fclose (traceFP);
-    }
-    traceFP = fp;
-}
-
-FILE *psTraceGetDestination()
-{
-    if (traceFP == NULL) {
+    if (fd == 1) {
         traceFP = stdout;
-    }
-    return traceFP;
+    } else if (fd == 2) {
+        traceFP = stderr;
+    } else if (fd == 0) {
+        traceFP = stdin;
+    } else if (fd > 2) {
+        traceFP = fdopen(fd, "w");
+    }
+}
+
+int psTraceGetDestination()
+{
+    int fd;
+    fd = fileno(traceFP);
+    return fd;
 }
 

trunk/psLib/src/sys/psTrace.h

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-26 00:44:44 $
+ *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-02 21:32:06 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -106 +106 @@
 /// Set the destination of future trace messages.
 void psTraceSetDestination(
-    FILE * fp                          ///< Pointer to file
+    int fd                             ///< File descriptor
 );
 
@@ -113 +113 @@
  *  @return FILE*:      File Destination
  */
-FILE *psTraceGetDestination(void);
+int psTraceGetDestination(void);
 
 /* \} */// End of SystemGroup Functions