Changeset 8244

Timestamp:

Aug 8, 2006, 4:01:02 PM (20 years ago)

Author:

jhoblitt

Message:

change psTrace() to include FILE, LINE, & func
change p_psTrace() to accept file, line, & function arguments
change p_psTrace() to concatenate the calling function name to the end of the facility name

Location:

trunk/psLib/src/sys

Files:

• psTrace.c (modified) (2 diffs)
• psTrace.h (modified) (4 diffs)

trunk/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:01:02 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -615 +615 @@
  null
  *****************************************************************************/
-void p_psTrace(const char *comp,        // component being traced
-               int level,               // desired trace level
-               const char *format,
-               ...)                     // arguments
-{
+void p_psTrace(
+    const char* file,                  ///< file name
+    int lineno,                        ///< line number in file
+    const char* func,                  ///< function name
+    const char *facil,                 ///< facilty of interest
+    psS32 level,                       ///< desired trace level
+    const char *format,                ///< printf-style format command
+    ...                                ///< trace message arguments
+)
+{
+    // XXX file & lineo are currently unused
     va_list ap;
     va_start(ap, format);
     //    format = va_arg(ap, char *);
-    psTraceV(comp, level, format, ap);
+    psString fullFacil = NULL;
+    psStringAppend(&fullFacil, "%s.%s", facil, func);
+    psTraceV(fullFacil, level, format, ap);
+    psFree(fullFacil);
     va_end(ap);
     // fflush(traceFP);

trunk/psLib/src/sys/psTrace.h

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-12 02:54:01 $
+ *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:01:02 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -91 +91 @@
 /// Send a trace message
 void p_psTrace(
+    const char* file,                  ///< file name
+    int lineno,                        ///< line number in file
+    const char* func,                  ///< function name
     const char *facil,                 ///< facilty of interest
-    psS32 myLevel,                     ///< desired trace level
+    psS32 level,                       ///< desired trace level
     const char *format,                ///< printf-style format command
     ...                                ///< trace message arguments
@@ -98 +101 @@
 
 #ifndef SWIG
-#define psTrace(facil, level, ...) p_psTrace(facil, level, __VA_ARGS__)
+#define psTrace(facil, level, ...) p_psTrace(__FILE__,__LINE__,__func__,facil, level, __VA_ARGS__)
 /** Sends a trace message. */
 void psTraceV(
@@ -128 +131 @@
 );
 
-/// Set all trace levels to zero (do not free nodes in the component tree).
+/// Set all trace levels to zero (do not free nodes in the facility tree).
 void psTraceReset();