Changeset 8284 for code/branches/kicklib2/src/external/bullet/LinearMath/btQuickprof.h

Timestamp:

Apr 21, 2011, 6:58:23 PM (13 years ago)

Author:

rgrieder

Message:

Merged revisions 7978 - 8096 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

• . (modified) (1 prop)
• src/external/bullet/LinearMath/btQuickprof.h (modified) (3 diffs)

code/branches/kicklib2/src/external/bullet/LinearMath/btQuickprof.h

@@ -19 +19 @@
 //#define BT_NO_PROFILE 1
 #ifndef BT_NO_PROFILE
-
+#include <stdio.h>//@todo remove this, backwards compatibility
 #include "btScalar.h"
-#include "LinearMath/btAlignedAllocator.h"
+#include "btAlignedAllocator.h"
 #include <new>
 
@@ -27 +27 @@
 
 
-//if you don't need btClock, you can comment next line
+
 #define USE_BT_CLOCK 1
 
 #ifdef USE_BT_CLOCK
-#ifdef __CELLOS_LV2__
-#include <sys/sys_time.h>
-#include <sys/time_util.h>
-#include <stdio.h>
-#endif
-
-#if defined (SUNOS) || defined (__SUNOS__) 
-#include <stdio.h> 
-#endif
-
-#if defined(WIN32) || defined(_WIN32)
-
-#define USE_WINDOWS_TIMERS 
-#define WIN32_LEAN_AND_MEAN 
-#define NOWINRES 
-#define NOMCX 
-#define NOIME 
-#ifdef _XBOX
-#include <Xtl.h>
-#else
-#include <windows.h>
-#endif
-#include <time.h>
-
-#else
-#include <sys/time.h>
-#endif
-
-#define mymin(a,b) (a > b ? a : b)
 
 ///The btClock is a portable basic clock that measures accurate time in seconds, use for profiling.
@@ -65 +36 @@
 {
 public:
-        btClock()
-        {
-#ifdef USE_WINDOWS_TIMERS
-                QueryPerformanceFrequency(&mClockFrequency);
-#endif
-                reset();
-        }
+        btClock();
 
-        ~btClock()
-        {
-        }
+        btClock(const btClock& other);
+        btClock& operator=(const btClock& other);
+
+        ~btClock();
 
         /// Resets the initial reference time.
-        void reset()
-        {
-#ifdef USE_WINDOWS_TIMERS
-                QueryPerformanceCounter(&mStartTime);
-                mStartTick = GetTickCount();
-                mPrevElapsedTime = 0;
-#else
-#ifdef __CELLOS_LV2__
-
-                typedef uint64_t  ClockSize;
-                ClockSize newTime;
-                //__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
-                SYS_TIMEBASE_GET( newTime );
-                mStartTime = newTime;
-#else
-                gettimeofday(&mStartTime, 0);
-#endif
-
-#endif
-        }
+        void reset();
 
         /// Returns the time in ms since the last call to reset or since 
         /// the btClock was created.
-        unsigned long int getTimeMilliseconds()
-        {
-#ifdef USE_WINDOWS_TIMERS
-                LARGE_INTEGER currentTime;
-                QueryPerformanceCounter(&currentTime);
-                LONGLONG elapsedTime = currentTime.QuadPart - 
-                        mStartTime.QuadPart;
-
-                // Compute the number of millisecond ticks elapsed.
-                unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / 
-                        mClockFrequency.QuadPart);
-
-                // Check for unexpected leaps in the Win32 performance counter.  
-                // (This is caused by unexpected data across the PCI to ISA 
-                // bridge, aka south bridge.  See Microsoft KB274323.)
-                unsigned long elapsedTicks = GetTickCount() - mStartTick;
-                signed long msecOff = (signed long)(msecTicks - elapsedTicks);
-                if (msecOff < -100 || msecOff > 100)
-                {
-                        // Adjust the starting time forwards.
-                        LONGLONG msecAdjustment = mymin(msecOff * 
-                                mClockFrequency.QuadPart / 1000, elapsedTime - 
-                                mPrevElapsedTime);
-                        mStartTime.QuadPart += msecAdjustment;
-                        elapsedTime -= msecAdjustment;
-
-                        // Recompute the number of millisecond ticks elapsed.
-                        msecTicks = (unsigned long)(1000 * elapsedTime / 
-                                mClockFrequency.QuadPart);
-                }
-
-                // Store the current elapsed time for adjustments next time.
-                mPrevElapsedTime = elapsedTime;
-
-                return msecTicks;
-#else
-
-#ifdef __CELLOS_LV2__
-                uint64_t freq=sys_time_get_timebase_frequency();
-                double dFreq=((double) freq) / 1000.0;
-                typedef uint64_t  ClockSize;
-                ClockSize newTime;
-                SYS_TIMEBASE_GET( newTime );
-                //__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
-
-                return (unsigned long int)((double(newTime-mStartTime)) / dFreq);
-#else
-
-                struct timeval currentTime;
-                gettimeofday(&currentTime, 0);
-                return (currentTime.tv_sec - mStartTime.tv_sec) * 1000 + 
-                        (currentTime.tv_usec - mStartTime.tv_usec) / 1000;
-#endif //__CELLOS_LV2__
-#endif
-        }
+        unsigned long int getTimeMilliseconds();
 
         /// Returns the time in us since the last call to reset or since 
         /// the Clock was created.
-        unsigned long int getTimeMicroseconds()
-        {
-#ifdef USE_WINDOWS_TIMERS
-                LARGE_INTEGER currentTime;
-                QueryPerformanceCounter(&currentTime);
-                LONGLONG elapsedTime = currentTime.QuadPart - 
-                        mStartTime.QuadPart;
-
-                // Compute the number of millisecond ticks elapsed.
-                unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / 
-                        mClockFrequency.QuadPart);
-
-                // Check for unexpected leaps in the Win32 performance counter.  
-                // (This is caused by unexpected data across the PCI to ISA 
-                // bridge, aka south bridge.  See Microsoft KB274323.)
-                unsigned long elapsedTicks = GetTickCount() - mStartTick;
-                signed long msecOff = (signed long)(msecTicks - elapsedTicks);
-                if (msecOff < -100 || msecOff > 100)
-                {
-                        // Adjust the starting time forwards.
-                        LONGLONG msecAdjustment = mymin(msecOff * 
-                                mClockFrequency.QuadPart / 1000, elapsedTime - 
-                                mPrevElapsedTime);
-                        mStartTime.QuadPart += msecAdjustment;
-                        elapsedTime -= msecAdjustment;
-                }
-
-                // Store the current elapsed time for adjustments next time.
-                mPrevElapsedTime = elapsedTime;
-
-                // Convert to microseconds.
-                unsigned long usecTicks = (unsigned long)(1000000 * elapsedTime / 
-                        mClockFrequency.QuadPart);
-
-                return usecTicks;
-#else
-
-#ifdef __CELLOS_LV2__
-                uint64_t freq=sys_time_get_timebase_frequency();
-                double dFreq=((double) freq)/ 1000000.0;
-                typedef uint64_t  ClockSize;
-                ClockSize newTime;
-                //__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
-                SYS_TIMEBASE_GET( newTime );
-
-                return (unsigned long int)((double(newTime-mStartTime)) / dFreq);
-#else
-
-                struct timeval currentTime;
-                gettimeofday(&currentTime, 0);
-                return (currentTime.tv_sec - mStartTime.tv_sec) * 1000000 + 
-                        (currentTime.tv_usec - mStartTime.tv_usec);
-#endif//__CELLOS_LV2__
-#endif 
-        }
-
+        unsigned long int getTimeMicroseconds();
 private:
-#ifdef USE_WINDOWS_TIMERS
-        LARGE_INTEGER mClockFrequency;
-        DWORD mStartTick;
-        LONGLONG mPrevElapsedTime;
-        LARGE_INTEGER mStartTime;
-#else
-#ifdef __CELLOS_LV2__
-        uint64_t        mStartTime;
-#else
-        struct timeval mStartTime;
-#endif
-#endif //__CELLOS_LV2__
-
+        struct btClockData* m_data;
 };