X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8df6de970d7b4e4bc1f8701d1f3ab1adedde8f00..4aa1406671c5d6abded83e3713b423ac4d40b7c9:/src/common/stopwatch.cpp?ds=sidebyside diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp index 21cd161679..fc12c801d2 100644 --- a/src/common/stopwatch.cpp +++ b/src/common/stopwatch.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: common/stopwatch.cpp +// Name: src/common/stopwatch.cpp // Purpose: wxStopWatch and other non-GUI stuff from wx/timer.h // Author: // Original version by Julian Smart @@ -9,7 +9,7 @@ // Modified by: // Created: 20.06.2003 (extracted from common/timercmn.cpp) // RCS-ID: $Id$ -// Copyright: (c) 1998-2003 wxWindows Team +// Copyright: (c) 1998-2003 wxWidgets Team // License: wxWindows license /////////////////////////////////////////////////////////////////////////////// @@ -28,23 +28,21 @@ #pragma hdrstop #endif +#include "wx/stopwatch.h" + #ifndef WX_PRECOMP + #ifdef __WXMSW__ + #include "wx/msw/wrapwin.h" + #endif #include "wx/intl.h" #include "wx/log.h" #endif //WX_PRECOMP -#include "wx/timer.h" -#include "wx/longlong.h" - // ---------------------------------------------------------------------------- // System headers // ---------------------------------------------------------------------------- -#if defined(__WIN32__) - #include -#endif - -#if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__) +#if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__) && !defined(__WXWINCE__) #define HAVE_FTIME #endif @@ -60,8 +58,17 @@ # undef HAVE_GETTIMEOFDAY #endif +#ifndef __WXPALMOS5__ +#ifndef __WXWINCE__ #include -#ifndef __WXMAC__ +#else +#include "wx/msw/private.h" +#include "wx/msw/wince/time.h" +#endif +#endif // __WXPALMOS5__ + + +#if !defined(__WXMAC__) && !defined(__WXWINCE__) #include // for time_t #endif @@ -72,26 +79,12 @@ #include #endif -#ifdef __WXMAC__ - #include - #include +#ifdef __WXPALMOS__ + #include + #include + #include #endif -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -// on some really old systems gettimeofday() doesn't have the second argument, -// define wxGetTimeOfDay() to hide this difference -#ifdef HAVE_GETTIMEOFDAY - #ifdef WX_GETTIMEOFDAY_NO_TZ - struct timezone; - #define wxGetTimeOfDay(tv, tz) gettimeofday(tv) - #else - #define wxGetTimeOfDay(tv, tz) gettimeofday((tv), (tz)) - #endif -#endif // HAVE_GETTIMEOFDAY - // ============================================================================ // implementation // ============================================================================ @@ -104,14 +97,48 @@ void wxStopWatch::Start(long t) { +#if 0 +// __WXMSW__ + LARGE_INTEGER frequency_li; + ::QueryPerformanceFrequency( &frequency_li ); + m_frequency = frequency_li.QuadPart; + if (m_frequency == 0) + { + m_t0 = wxGetLocalTimeMillis() - t; + } + else + { + LARGE_INTEGER counter_li; + ::QueryPerformanceCounter( &counter_li ); + wxLongLong counter = counter_li.QuadPart; + m_t0 = (counter * 10000 / m_frequency) - t*10; + } +#else m_t0 = wxGetLocalTimeMillis() - t; +#endif m_pause = 0; m_pauseCount = 0; } long wxStopWatch::GetElapsedTime() const { +#if 0 +//__WXMSW__ + if (m_frequency == 0) + { + return (wxGetLocalTimeMillis() - m_t0).GetLo(); + } + else + { + LARGE_INTEGER counter_li; + ::QueryPerformanceCounter( &counter_li ); + wxLongLong counter = counter_li.QuadPart; + wxLongLong res = (counter * 10000 / m_frequency) - m_t0; + return res.GetLo() / 10; + } +#else return (wxGetLocalTimeMillis() - m_t0).GetLo(); +#endif } long wxStopWatch::Time() const @@ -187,51 +214,7 @@ long wxGetLocalTime() // Get UTC time as seconds since 00:00:00, Jan 1st 1970 long wxGetUTCTime() { - struct tm tm; - struct tm *ptm; - 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 in localtime - - if (( t0 != (time_t)-1 ) && ( t1 != (time_t)-1 )) - { - // To get t0 as GMT we convert to a struct tm with gmtime, - // and then back again. - // - ptm = gmtime(&t0); - - if (ptm) - { - memcpy(&tm, ptm, sizeof(tm)); - t0 = mktime(&tm); - - if (t0 != (time_t)-1 ) - return (long)difftime(t1, t0) + (60 * 60 * 24 * 4); - wxLogSysError(_("mktime() failed")); - } - else - { - wxLogSysError(_("gmtime() failed")); - } - } - - wxLogError(_("Failed to get the UTC system time.")); - - return -1; + return (long)time(NULL); } #if wxUSE_LONGLONG @@ -244,7 +227,19 @@ wxLongLong wxGetLocalTimeMillis() // If possible, use a function which avoids conversions from // broken-up time structures to milliseconds -#if defined(__WXMSW__) && defined(__MWERKS__) +#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__) && (defined(__WINE__) || defined(__MWERKS__)) // This should probably be the way all WXMSW compilers should do it // Go direct to the OS for time @@ -260,10 +255,10 @@ wxLongLong wxGetLocalTimeMillis() wxLongLong now( nowft.dwHighDateTime, nowft.dwLowDateTime ); // time in 100 nanoseconds return ( now - then ) / 10000.0; // time from 00:00:00 Jan 1st 1970 to now in milliseconds - + #elif defined(HAVE_GETTIMEOFDAY) struct timeval tp; - if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 ) + if ( wxGetTimeOfDay(&tp) != -1 ) { val *= tp.tv_sec; return (val + (tp.tv_usec / 1000)); @@ -278,29 +273,9 @@ wxLongLong wxGetLocalTimeMillis() // 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); + (void)::ftime(&tp); val *= tp.time; return (val + tp.millitm); -#elif defined(__WXMAC__) - - static UInt64 gMilliAtStart = 0; - - Nanoseconds upTime = AbsoluteToNanoseconds( UpTime() ); - - if ( gMilliAtStart == 0 ) - { - time_t start = time(NULL); - gMilliAtStart = ((UInt64) start) * 1000000L; - gMilliAtStart -= upTime.lo / 1000 ; - gMilliAtStart -= ( ( (UInt64) upTime.hi ) << 32 ) / (1000 * 1000); - } - - UInt64 millival = gMilliAtStart; - millival += upTime.lo / (1000 * 1000); - millival += ( ( (UInt64) upTime.hi ) << 32 ) / (1000 * 1000); - val = millival; - - return val; #else // no gettimeofday() nor ftime() // We use wxGetLocalTime() to get the seconds since // 00:00:00 Jan 1st 1970 and then whatever is available @@ -313,11 +288,16 @@ wxLongLong wxGetLocalTimeMillis() val *= wxGetLocalTime(); // GRG: This will go soon as all WIN32 seem to have ftime +// JACS: unfortunately not. WinCE doesn't have it. #if defined (__WIN32__) // If your platform/compiler needs to use two different functions // to get ms resolution, please do NOT just shut off these warnings, // drop me a line instead at + + // FIXME +#ifndef __WXWINCE__ #warning "Possible clock skew bug in wxGetLocalTimeMillis()!" +#endif SYSTEMTIME st; ::GetLocalTime(&st); @@ -341,6 +321,11 @@ wxLongLong wxGetLocalTimeMillis() #endif // time functions } -#endif // wxUSE_LONGLONG +#else // !wxUSE_LONGLONG +double wxGetLocalTimeMillis(void) +{ + return (double(clock()) / double(CLOCKS_PER_SEC)) * 1000.0; +} +#endif // wxUSE_LONGLONG/!wxUSE_LONGLONG