IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 2426


Ignore:
Timestamp:
Nov 24, 2004, 10:12:28 AM (22 years ago)
Author:
gusciora
Message:

I modified the defualt trace level behavior for the psTrace routines.

Location:
trunk/psLib
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/psLib/src/sys/psTrace.c

    r2273 r2426  
    99 *  @author George Gusciora, MHPCC
    1010 *
    11  *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-11-04 01:05:00 $
     11 *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-11-24 20:12:28 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     
    385385        traceLevel = doGetTraceLevel(name);
    386386    }
     387
     388    // XXX: The default trace level is currently set at -1, which is not a
     389    // valid trace level.  This is convenient in determining whether or not
     390    // a component should inherit the trace level from parent nodes.  However,
     391    // it's not clear that -1 should ever be returned by this function.
     392    // The SDR is unclear on this point and we should probably request IfA
     393    // comment.
     394    if (traceLevel == PS_DEFAULT_TRACE_LEVEL) {
     395        traceLevel = PS_THE_OTHER_DEFAULT_TRACE_LEVEL;
     396    }
     397
    387398    return(traceLevel);
    388399}
     
    454465    }
    455466
    456     doPrintTraceLevels(cRoot, 0, PS_DEFAULT_TRACE_LEVEL);
     467    doPrintTraceLevels(cRoot, 0, PS_THE_OTHER_DEFAULT_TRACE_LEVEL);
    457468}
    458469
  • trunk/psLib/src/sys/psTrace.h

    r2228 r2426  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-10-28 22:47:00 $
     11 *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-11-24 20:12:28 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     
    1919#define PS_UNKNOWN_TRACE_LEVEL -9999   // we don't know this name's level
    2020#define PS_DEFAULT_TRACE_LEVEL -1
     21#define PS_THE_OTHER_DEFAULT_TRACE_LEVEL 0
    2122
    2223/** \addtogroup LogTrace
  • trunk/psLib/src/sysUtils/psTrace.c

    r2273 r2426  
    99 *  @author George Gusciora, MHPCC
    1010 *
    11  *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-11-04 01:05:00 $
     11 *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-11-24 20:12:28 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     
    385385        traceLevel = doGetTraceLevel(name);
    386386    }
     387
     388    // XXX: The default trace level is currently set at -1, which is not a
     389    // valid trace level.  This is convenient in determining whether or not
     390    // a component should inherit the trace level from parent nodes.  However,
     391    // it's not clear that -1 should ever be returned by this function.
     392    // The SDR is unclear on this point and we should probably request IfA
     393    // comment.
     394    if (traceLevel == PS_DEFAULT_TRACE_LEVEL) {
     395        traceLevel = PS_THE_OTHER_DEFAULT_TRACE_LEVEL;
     396    }
     397
    387398    return(traceLevel);
    388399}
     
    454465    }
    455466
    456     doPrintTraceLevels(cRoot, 0, PS_DEFAULT_TRACE_LEVEL);
     467    doPrintTraceLevels(cRoot, 0, PS_THE_OTHER_DEFAULT_TRACE_LEVEL);
    457468}
    458469
  • trunk/psLib/src/sysUtils/psTrace.h

    r2228 r2426  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-10-28 22:47:00 $
     11 *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-11-24 20:12:28 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     
    1919#define PS_UNKNOWN_TRACE_LEVEL -9999   // we don't know this name's level
    2020#define PS_DEFAULT_TRACE_LEVEL -1
     21#define PS_THE_OTHER_DEFAULT_TRACE_LEVEL 0
    2122
    2223/** \addtogroup LogTrace
  • trunk/psLib/test/sysUtils/verified/tst_psTrace.stderr

    r2204 r2426  
    1414\**********************************************************************************/
    1515
    16 .                    -1
    17  A                   -1
    18   B                  -1
    19    C                 -1
    20     D                -1
     16.                    0
     17 A                   0
     18  B                  0
     19   C                 0
     20    D                0
    2121     E               5
    2222
     
    2929\**********************************************************************************/
    3030
    31 .                    -1
    32  A                   -1
     31.                    0
     32 A                   0
    3333  B                  2
    3434   C                 2
    3535    D                2
    3636     E               5
    37 .                    -1
    38  A                   -1
     37.                    0
     38 A                   0
    3939  B                  10
    4040   C                 10
Note: See TracChangeset for help on using the changeset viewer.