#include "wx/stopwatch.h"
+#if wxUSE_STOPWATCH
+
#ifndef WX_PRECOMP
#ifdef __WXMSW__
#include "wx/msw/wrapwin.h"
#endif
- #include "wx/intl.h"
#include "wx/log.h"
+ #include "wx/thread.h"
#endif //WX_PRECOMP
-// ----------------------------------------------------------------------------
-// System headers
-// ----------------------------------------------------------------------------
-
-#if defined(__VISAGECPP__) && !defined(HAVE_FTIME)
- #define HAVE_FTIME
-# if __IBMCPP__ >= 400
- # define ftime(x) _ftime(x)
-# endif
-#endif
-
-#if defined(__MWERKS__) && defined(__WXMSW__)
-# undef HAVE_FTIME
-# undef HAVE_GETTIMEOFDAY
-#endif
-
-#ifndef __WXPALMOS5__
-#ifndef __WXWINCE__
-#include <time.h>
-#else
-#include "wx/msw/private.h"
-#include "wx/msw/wince/time.h"
-#endif
-#endif // __WXPALMOS5__
-
-
-#if !defined(__WXMAC__) && !defined(__WXWINCE__)
- #include <sys/types.h> // for time_t
-#endif
-
-#if defined(HAVE_GETTIMEOFDAY)
- #include <sys/time.h>
- #include <unistd.h>
-#elif defined(HAVE_FTIME)
- #include <sys/timeb.h>
-#endif
-
-#ifdef __WXPALMOS__
- #include <DateTime.h>
- #include <TimeMgr.h>
- #include <SystemMgr.h>
-#endif
-
// ============================================================================
// implementation
// ============================================================================
// wxStopWatch
// ----------------------------------------------------------------------------
-#if wxUSE_STOPWATCH
-
namespace
{
return freq.QuadPart != 0;
}
- wxCriticalSection cs;
+ wxCRIT_SECT_DECLARE_MEMBER(cs);
LARGE_INTEGER freq;
bool init;
} gs_perfCounter;
#ifdef __WXMSW__
if ( !gs_perfCounter.init )
{
- wxCriticalSectionLocker lock(gs_perfCounter.cs);
+ wxCRIT_SECT_LOCKER(lock, gs_perfCounter.cs);
::QueryPerformanceFrequency(&gs_perfCounter.freq);
// Just a sanity check: it's not supposed to happen but verify that
return gs_perfCounter.freq.QuadPart;
#endif // __WXMSW__
+#ifdef HAVE_GETTIMEOFDAY
+ // With gettimeofday() we can have nominally microsecond precision and
+ // while this is not the case in practice, it's still better than
+ // millisecond.
+ return MICROSECONDS_PER_SECOND;
+#else // !HAVE_GETTIMEOFDAY
// Currently milliseconds are used everywhere else.
return MILLISECONDS_PER_SECOND;
+#endif // HAVE_GETTIMEOFDAY/!HAVE_GETTIMEOFDAY
}
void wxStopWatch::Start(long t0)
{
+ // Calling Start() makes the stop watch run however many times it was
+ // paused before.
+ m_pauseCount = 0;
+
DoStart();
m_t0 -= (wxLongLong(t0)*GetClockFreq())/MILLISECONDS_PER_SECOND;
}
#endif // __WXMSW__
- return wxGetLocalTimeMillis();
+#ifdef HAVE_GETTIMEOFDAY
+ return wxGetUTCTimeUSec();
+#else // !HAVE_GETTIMEOFDAY
+ return wxGetUTCTimeMillis();
+#endif // HAVE_GETTIMEOFDAY/!HAVE_GETTIMEOFDAY
}
wxLongLong wxStopWatch::TimeInMicro() const
// starts the global timer
void wxStartTimer()
{
- wxStartTime = wxGetLocalTimeMillis();
+ wxStartTime = wxGetUTCTimeMillis();
}
// Returns elapsed time in milliseconds
long wxGetElapsedTime(bool resetTimer)
{
wxLongLong oldTime = wxStartTime;
- wxLongLong newTime = wxGetLocalTimeMillis();
+ wxLongLong newTime = wxGetUTCTimeMillis();
if ( resetTimer )
wxStartTime = newTime;
}
#endif // wxUSE_LONGLONG
-
-// ----------------------------------------------------------------------------
-// the functions to get the current time and timezone info
-// ----------------------------------------------------------------------------
-
-// Get local time as seconds since 00:00:00, Jan 1st 1970
-long wxGetLocalTime()
-{
- struct tm tm;
- time_t t0, t1;
-
- // This cannot be made static because mktime can overwrite it.
- //
- memset(&tm, 0, sizeof(tm));
- tm.tm_year = 70;
- tm.tm_mon = 0;
- tm.tm_mday = 5; // not Jan 1st 1970 due to mktime 'feature'
- tm.tm_hour = 0;
- tm.tm_min = 0;
- tm.tm_sec = 0;
- tm.tm_isdst = -1; // let mktime guess
-
- // Note that mktime assumes that the struct tm contains local time.
- //
- t1 = time(&t1); // now
- t0 = mktime(&tm); // origin
-
- // Return the difference in seconds.
- //
- if (( t0 != (time_t)-1 ) && ( t1 != (time_t)-1 ))
- return (long)difftime(t1, t0) + (60 * 60 * 24 * 4);
-
- wxLogSysError(_("Failed to get the local system time"));
- return -1;
-}
-
-// Get UTC time as seconds since 00:00:00, Jan 1st 1970
-long wxGetUTCTime()
-{
- return (long)time(NULL);
-}
-
-#if wxUSE_LONGLONG
-
-wxLongLong wxGetUTCTimeUSec()
-{
-#if defined(__WXMSW__)
- FILETIME ft;
- ::GetSystemTimeAsFileTime(&ft);
-
- // FILETIME is in 100ns or 0.1us since 1601-01-01, transform to us since
- // 1970-01-01.
- wxLongLong t(ft.dwHighDateTime, ft.dwLowDateTime);
- t /= 10;
- t -= wxLL(11644473600000000); // Unix - Windows epochs difference in us.
- return t;
-#else // non-MSW
-
-#ifdef HAVE_GETTIMEOFDAY
- timeval tv;
- if ( wxGetTimeOfDay(&tv) != -1 )
- {
- wxLongLong val(tv.tv_sec);
- val *= MICROSECONDS_PER_SECOND;
- val += tv.tv_usec;
- return val;
- }
-#endif // HAVE_GETTIMEOFDAY
-
- // Fall back to lesser precision function.
- return wxGetUTCTimeMillis()*1000;
-#endif // MSW/!MSW
-}
-
-// Get local time as milliseconds since 00:00:00, Jan 1st 1970
-wxLongLong wxGetUTCTimeMillis()
-{
- wxLongLong val = 1000l;
-
- // If possible, use a function which avoids conversions from
- // broken-up time structures to milliseconds
-#if defined(__WXPALMOS__)
- DateTimeType thenst;
- thenst.second = 0;
- thenst.minute = 0;
- thenst.hour = 0;
- thenst.day = 1;
- thenst.month = 1;
- thenst.year = 1970;
- thenst.weekDay = 5;
- uint32_t now = TimGetSeconds();
- uint32_t then = TimDateTimeToSeconds (&thenst);
- return SysTimeToMilliSecs(SysTimeInSecs(now - then));
-#elif defined(__WXMSW__)
- FILETIME ft;
- ::GetSystemTimeAsFileTime(&ft);
-
- // FILETIME is expressed in 100ns (or 0.1us) units since 1601-01-01,
- // transform them to ms since 1970-01-01.
- wxLongLong t(ft.dwHighDateTime, ft.dwLowDateTime);
- t /= 10000;
- t -= wxLL(11644473600000); // Unix - Windows epochs difference in ms.
- return t;
-#elif defined(HAVE_GETTIMEOFDAY)
- struct timeval tp;
- if ( wxGetTimeOfDay(&tp) != -1 )
- {
- val *= tp.tv_sec;
- return (val + (tp.tv_usec / 1000));
- }
- else
- {
- wxLogError(_("wxGetTimeOfDay failed."));
- return 0;
- }
-#elif defined(HAVE_FTIME)
- struct timeb tp;
-
- // ftime() is void and not int in some mingw32 headers, so don't
- // test the return code (well, it shouldn't fail anyhow...)
- (void)::ftime(&tp);
- val *= tp.time;
- return (val + tp.millitm);
-#else // no gettimeofday() nor ftime()
- // If your platform/compiler does not support ms resolution please
- // do NOT just shut off these warnings, drop me a line instead at
- // <guille@iies.es>
-
- #if defined(__VISUALC__) || defined (__WATCOMC__)
- #pragma message("wxStopWatch will be up to second resolution!")
- #elif defined(__BORLANDC__)
- #pragma message "wxStopWatch will be up to second resolution!"
- #else
- #warning "wxStopWatch will be up to second resolution!"
- #endif // compiler
-
- val *= wxGetUTCTime();
- return val;
-#endif // time functions
-}
-
-wxLongLong wxGetLocalTimeMillis()
-{
- return wxGetUTCTimeMillis() - wxGetTimeZone()*MILLISECONDS_PER_SECOND;
-}
-
-#else // !wxUSE_LONGLONG
-
-double wxGetLocalTimeMillis(void)
-{
- return (double(clock()) / double(CLOCKS_PER_SEC)) * 1000.0;
-}
-
-#endif // wxUSE_LONGLONG/!wxUSE_LONGLONG
projects / wxWidgets.git / blobdiff