Additional win32 support.
This commit is contained in:
parent
6ca9596807
commit
3e63d6ca5d
@ -25,6 +25,9 @@
|
|||||||
*
|
*
|
||||||
***************************************************************************
|
***************************************************************************
|
||||||
* $Log$
|
* $Log$
|
||||||
|
* Revision 1.2 1998/11/02 18:28:31 curt
|
||||||
|
* Additional win32 support.
|
||||||
|
*
|
||||||
* Revision 1.1 1998/09/01 19:06:30 curt
|
* Revision 1.1 1998/09/01 19:06:30 curt
|
||||||
* Initial revision.
|
* Initial revision.
|
||||||
*
|
*
|
||||||
@ -58,8 +61,14 @@
|
|||||||
# define HAVE_GETRUSAGE
|
# define HAVE_GETRUSAGE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_GETRUSAGE
|
#if defined( WIN32 ) && defined( HAVE_GETRUSAGE )
|
||||||
|
# undef HAVE_GETRUSAGE
|
||||||
|
#endif // WIN32
|
||||||
|
|
||||||
|
#if defined( HAVE_GETRUSAGE )
|
||||||
# include <sys/resource.h>
|
# include <sys/resource.h>
|
||||||
|
#elif defined( WIN32 )
|
||||||
|
# include <windows.h>
|
||||||
#else
|
#else
|
||||||
# include <time.h>
|
# include <time.h>
|
||||||
#endif
|
#endif
|
||||||
@ -97,13 +106,15 @@ private:
|
|||||||
|
|
||||||
double systemTime()
|
double systemTime()
|
||||||
{
|
{
|
||||||
#ifdef HAVE_GETRUSAGE
|
#if defined( HAVE_GETRUSAGE )
|
||||||
getrusage(RUSAGE_SELF, &resourceUsage_);
|
getrusage(RUSAGE_SELF, &resourceUsage_);
|
||||||
double seconds = resourceUsage_.ru_utime.tv_sec
|
double seconds = resourceUsage_.ru_utime.tv_sec
|
||||||
+ resourceUsage_.ru_stime.tv_sec;
|
+ resourceUsage_.ru_stime.tv_sec;
|
||||||
double micros = resourceUsage_.ru_utime.tv_usec
|
double micros = resourceUsage_.ru_utime.tv_usec
|
||||||
+ resourceUsage_.ru_stime.tv_usec;
|
+ resourceUsage_.ru_stime.tv_usec;
|
||||||
return seconds + micros/1.0e6;
|
return seconds + micros/1.0e6;
|
||||||
|
#elif defined( WIN32 )
|
||||||
|
return double(GetTickCount()) * double(1e-3);
|
||||||
#else
|
#else
|
||||||
return clock() / (double) CLOCKS_PER_SEC;
|
return clock() / (double) CLOCKS_PER_SEC;
|
||||||
#endif
|
#endif
|
||||||
@ -111,7 +122,7 @@ private:
|
|||||||
|
|
||||||
// enum { uninitialized, running, stopped } state_;
|
// enum { uninitialized, running, stopped } state_;
|
||||||
|
|
||||||
#ifdef HAVE_GETRUSAGE
|
#if defined( HAVE_GETRUSAGE )
|
||||||
struct rusage resourceUsage_;
|
struct rusage resourceUsage_;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user