Index: /trunk/psLib/pslib.kdevelop =================================================================== --- /trunk/psLib/pslib.kdevelop (revision 5082) +++ /trunk/psLib/pslib.kdevelop (revision 5083) @@ -1,194 +1,0 @@ - - - - Robert Daniel DeSonia - robert.desonia@mhpcc.hpc.mil - 1.6 - KDevAutoProject - C - - C - Code - - - . - false - - - - - - src/pslib - default - - - src/pslib - true - executable - - - - optimized - kdevgccoptions - kdevgppoptions - kdevg77options - -O2 -g0 - - - --enable-debug=full - debug - kdevgccoptions - kdevgppoptions - kdevg77options - -O0 -g3 - - - - - - - - - - - - ada - ada_bugs_gcc - bash - bash_bugs - clanlib - w3c-dom-level2-html - fortran_bugs_gcc - gnome1 - gnustep - gtk - gtk_bugs - haskell - haskell_bugs_ghc - java_bugs_gcc - java_bugs_sun - kde2book - libstdc++ - opengl - pascal_bugs_fp - php - php_bugs - perl - perl_bugs - python - python_bugs - qt-kdev3 - ruby - ruby_bugs - sdl - stl - w3c-svg - sw - w3c-uaag10 - wxwidgets_bugs - - - Guide to the Qt Translation Tools - Qt Assistant Manual - Qt Designer Manual - Qt Reference Documentation - qmake User Guide - - - KDE Libraries (Doxygen) - - - - - - - - - - - - - false - false - - - *.o,*.lo,CVS - false - false - - - - - Doxygen Documentation Collection - ${APPNAMELC}.tag - - - - psLib - pslib - PSLIB - Robert Daniel DeSonia - - robert.desonia@mhpcc.hpc.mil - GPL - COPYING - -I/usr/include - -lm - 1.5 - /home/desonia/pslib - - - - - true - true - true - false - true - true - true - 250 - 400 - 250 - - - - set - m_,_ - theValue - true - true - - - - - .h - .cpp - - - - - - - libtool - - - - true - false - false - - - false - true - 10 - - - - true - true - true - true - -C - - Index: /trunk/psLib/src/astro/psTime.c =================================================================== --- /trunk/psLib/src/astro/psTime.c (revision 5082) +++ /trunk/psLib/src/astro/psTime.c (revision 5083) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.70 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-09-13 01:09:58 $ + * @version $Revision: 1.71 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-09-21 02:11:16 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1611,2 +1611,88 @@ } +static psHash *timers = NULL; +static char timerName[256] = "\0"; + +static void psTimerFree () +{ + + psFree (timers); + p_psTimeFinalize(); + return; +} + +// start/restart a named timer +bool psTimerStart (char *name) +{ + + psTime *start; + + if (timers == NULL) { + timers = psHashAlloc (16); + // psMemSetDeallocator(timers, (psFreeFunc)psTimerFree); + } + strncpy(timerName, name, 256); + start = psTimeGetNow (PS_TIME_UTC); + psHashAdd (timers, name, start); + psFree (start); + return (true); +} + +psF64 psTimerClear (char *name) +{ + psF64 timerTime = 0.0; + bool status; + + if (name == NULL) + return false; + timerTime = psTimerMark(name); + status = psHashRemove (timers, name); + strncpy(timerName, "\0", 256); + if ( !status ) + return 0.0; + else + return timerTime; +} + +// get current elapsed time on named timer +psF64 psTimerMark (char *name) +{ + + psTime *start; + psTime *mark; + psF64 delta; + + if (timers == NULL) + return (0); + start = (psTime*)psHashLookup (timers, name); + if (start == NULL) + return (0); + mark = psTimeGetNow (PS_TIME_UTC); + delta = psTimeDelta (mark, start); + psFree (mark); + // psFree (start); -- XXX is psHashLookup not psMemCopying? + + return (delta); +} + +psF64 psTimerStop(void) +{ + psF64 timerTime = 0.0; + + if ( strncmp(timerName, "\0", 256) ) + timerTime = psTimerMark(timerName); + strncpy(timerName, "\0", 2); + psTimerFree(); + return timerTime; +} + +void psTimeInitialize(const char *timeConfig) +{ + p_psTimeInit(timeConfig); +} + +void psTimeFinalize(void) +{ + p_psTimeFinalize(); +} + Index: /trunk/psLib/src/astro/psTime.h =================================================================== --- /trunk/psLib/src/astro/psTime.h (revision 5082) +++ /trunk/psLib/src/astro/psTime.h (revision 5083) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.39 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-09-13 01:09:58 $ + * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-09-21 02:11:16 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -82,4 +82,12 @@ ); +/** Initialize time data. + * + * Reads the configuration file and sets up the appropriate psTimeTables and predictions. + */ +void psTimeInitialize( + const char *timeConfig ///< psTime configuration file +); + /** Free memory persistant time data. * @@ -89,4 +97,10 @@ */ psBool p_psTimeFinalize(void); + +/** Frees memory that was allocated by psTime functions. + * + * Allows a subsequent search for leaked memory. + */ +void psTimeFinalize(void); /** Allocate time struct. @@ -369,4 +383,18 @@ ); +bool psTimerStart( + char *name +); + +psF64 psTimerClear( + char *name +); + +psF64 psTimerMark( + char *name +); + +psF64 psTimerStop(void); + /// @} Index: /trunk/psLib/test/astro/tst_psTime_04.c =================================================================== --- /trunk/psLib/test/astro/tst_psTime_04.c (revision 5082) +++ /trunk/psLib/test/astro/tst_psTime_04.c (revision 5083) @@ -15,6 +15,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-09-13 01:39:13 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-09-21 02:11:16 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -32,4 +32,5 @@ static psS32 testTimeInit5(void); static psS32 testTimeInit6(void); +static psS32 testTimer1(void); testDescription tests[] = { @@ -40,4 +41,5 @@ {testTimeInit5,000,"p_psTimeInit",0,false}, {testTimeInit6,000,"p_psTimeInit",0,false}, + {testTimer1,000,"psTimer",0,false}, {NULL} }; @@ -105,2 +107,31 @@ } +psS32 testTimer1(void) +{ + psF64 testTime = 0.0; + psF64 testTime2 = 0.0; + psF64 testTime3 = 0.0; + + if ( !psTimerStart("newTime") ) { + printf("TimerStart Failed\n"); + return 1; + } + testTime = psTimerMark("newTime"); + if (testTime == 0.0) { + printf("TimerMark Failed\n"); + return 2; + } + testTime2 = psTimerClear("newTime"); + if (testTime2 == 0.0) { + printf("TimerClear Failed\n"); + return 3; + } + psTimerStart("newTime"); + testTime3 = psTimerStop(); + if (testTime3 == 0.0) { + printf("TimerStop Failed\n"); + return 4; + } + return 0; +} + Index: /trunk/psLib/test/astro/verified/tst_psTime_04.stderr =================================================================== --- /trunk/psLib/test/astro/verified/tst_psTime_04.stderr (revision 5082) +++ /trunk/psLib/test/astro/verified/tst_psTime_04.stderr (revision 5083) @@ -73,2 +73,11 @@ ---> TESTPOINT PASSED (psTime{p_psTimeInit} | tst_psTime_04.c) +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_psTime_04.c * +* TestPoint: psTime{psTimer} * +* TestType: Positive * +\**********************************************************************************/ + + +---> TESTPOINT PASSED (psTime{psTimer} | tst_psTime_04.c) +