///////////////////////////////////////////////////////////////////////////////
-// 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
// Created: 20.06.2003 (extracted from common/timercmn.cpp)
// RCS-ID: $Id$
// Copyright: (c) 1998-2003 wxWidgets Team
-// License: wxWindows license
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
#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/longlong.h"
-#include "wx/stopwatch.h"
-
// ----------------------------------------------------------------------------
// System headers
// ----------------------------------------------------------------------------
-#if defined(__WIN32__)
- #include "wx/msw/wrapwin.h"
-#endif
-
#if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__) && !defined(__WXWINCE__)
#define HAVE_FTIME
#endif
# 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
#include <sys/timeb.h>
#endif
-#ifdef __WXMAC__
- #include <Timer.h>
- #include <DriverServices.h>
+#ifdef __WXPALMOS__
+ #include <DateTime.h>
+ #include <TimeMgr.h>
+ #include <SystemMgr.h>
#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
// ============================================================================
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
// If possible, use a function which avoids conversions from
// broken-up time structures to milliseconds
-#if defined(__WXMSW__) && (defined(__WINE__) || 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
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));
// 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
#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
projects / wxWidgets.git / blobdiff