Changeset 12286 for trunk/psLib/src/sys/psTrace.c

Timestamp:

Mar 6, 2007, 2:17:48 PM (19 years ago)

Author:

Paul Price

Message:

Changing assertions to be more suitable.

File:

• trunk/psLib/src/sys/psTrace.c (modified) (10 diffs)

trunk/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.85 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-07 01:15:49 $
+ *  @version $Revision: 1.86 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-07 00:17:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -22 +22 @@
  might give that a numerically low trace level, such as 1, so then any
  non-zero trace level in that code component will display thatmessage.
- 
+
  We build a tree of trace components.  Every node in the tree has a
  depth, which is it's distance from the root.  However, this is not
  not the same thing as a node's "level", which corresponds to the
  trace level of that node.
- 
+
 I think the following is the correct behavior, but not sure:
     PS_UNKNOWN_TRACE_LEVEL: We never set the level of a component to this
     value.  This value is only used when psTraceGetLevel is called with
     a bad component name, or if the component root is undefined, I think.
- 
+
     PS_DEFAULT_TRACE_LEVEL: This should only be used when adding the
     intermediate components of a psS64 name.  Ie. the "B" in .A.B.C
- 
+
  *****************************************************************************/
 
@@ -134 +134 @@
 // NB: declares TARGET!
 #define FACILITY(TARGET, FUNC, FACIL) \
-size_t _facilLength = strlen(FACIL); /* Length of facility name */ \
-size_t _funcLength = strlen(FUNC);   /* Length of function name */ \
-char TARGET[_facilLength + _funcLength + 2]; /* facility + the function name */ \
-strcpy(&TARGET[0], FACIL); \
-TARGET[_facilLength] = '.'; \
-strcpy(&TARGET[_facilLength + 1], FUNC);
+    size_t _facilLength = strlen(FACIL); /* Length of facility name */ \
+    size_t _funcLength = strlen(FUNC);   /* Length of function name */ \
+    char TARGET[_facilLength + _funcLength + 2]; /* facility + the function name */ \
+    strcpy(&TARGET[0], FACIL); \
+    TARGET[_facilLength] = '.'; \
+    strcpy(&TARGET[_facilLength + 1], FUNC);
 
 
 /*****************************************************************************
 Set all trace levels to zero.
- 
+
 XXX: Currently, no function calls this routine.
  *****************************************************************************/
@@ -267 +267 @@
     psSetTraceLevel(): add the component named "comp" to the component tree,
  if it is not already there, and set it's trace level to "level".
- 
+
     NOTE: We modified this so that the user may omit the leading "," in a
     component name.  Since the code was already implemented assuming the "."
     was required, rather than change all that code, in this function, I
     simply add a leading "." to the component name if there is none.
- 
+
     Input:
  comp
@@ -284 +284 @@
                     int level)  // desired trace level
 {
-    PS_ASSERT_PTR_NON_NULL(comp, 0);
+    PS_ASSERT_STRING_NON_EMPTY(comp, 0);
 
     char *compName = NULL;
@@ -331 +331 @@
  finds that component, it returns the level of that component.
  Otherwise, it returns ???.
- 
+
     NOTE: We modified this so that the user may omit the leading "," in a
     component name.  Since the code was already implemented assuming the "."
     was required, rather than change all that code, in this function, I
     simply add a leading "." to the component name if there is none.
- 
+
     Inputs:
  name:
@@ -449 +449 @@
                       const char *name)
 {
-    PS_ASSERT_PTR_NON_NULL(name, 0);
-    PS_ASSERT_PTR_NON_NULL(func, 0);
+    PS_ASSERT_STRING_NON_EMPTY(name, 0);
+    PS_ASSERT_STRING_NON_EMPTY(func, 0);
 
     FACILITY(facility, func, name);
@@ -527 +527 @@
               va_list ap)
 {
-    PS_ASSERT_PTR_NON_NULL(comp, );
-    PS_ASSERT_PTR_NON_NULL(format, );
+    PS_ASSERT_STRING_NON_EMPTY(comp, );
+    PS_ASSERT_STRING_NON_EMPTY(format, );
 
     // XXX EAM : fd < 1 does not print messages
@@ -660 +660 @@
 )
 {
-    PS_ASSERT_PTR_NON_NULL(file, );
-    PS_ASSERT_PTR_NON_NULL(func, );
-    PS_ASSERT_PTR_NON_NULL(facil, );
-    PS_ASSERT_PTR_NON_NULL(format, );
+    PS_ASSERT_STRING_NON_EMPTY(file, );
+    PS_ASSERT_STRING_NON_EMPTY(func, );
+    PS_ASSERT_STRING_NON_EMPTY(facil, );
+    PS_ASSERT_STRING_NON_EMPTY(format, );
 
     FACILITY(name, func, facil);
@@ -698 +698 @@
     included in message traces.  It does not determine the order in which that
     information will appear (that order is fixed).
- 
+
 Input:
     fmt: a string specifying the format.