Changeset 8351 for code/trunk/src/external/bullet/LinearMath/btQuickprof.cpp

Timestamp:

Apr 28, 2011, 7:15:14 AM (13 years ago)

Author:

rgrieder

Message:

Merged kicklib2 branch back to trunk (includes former branches ois_update, mac_osx and kicklib).

Notes for updating

Linux:
You don't need an extra package for CEGUILua and Tolua, it's already shipped with CEGUI.
However you do need to make sure that the OgreRenderer is installed too with CEGUI 0.7 (may be a separate package).
Also, Orxonox now recognises if you install the CgProgramManager (a separate package available on newer Ubuntu on Debian systems).

Windows:
Download the new dependency packages versioned 6.0 and use these. If you have problems with that or if you don't like the in game console problem mentioned below, you can download the new 4.3 version of the packages (only available for Visual Studio 2005/2008).

Key new features:

• *Support for Mac OS X*
• Visual Studio 2010 support
• Bullet library update to 2.77
• OIS library update to 1.3
• Support for CEGUI 0.7 —> Support for Arch Linux and even SuSE
• Improved install target
• Compiles now with GCC 4.6
• Ogre Cg Shader plugin activated for Linux if available
• And of course lots of bug fixes

There are also some regressions:

• No support for CEGUI 0.5, Ogre 1.4 and boost 1.35 - 1.39 any more
• In game console is not working in main menu for CEGUI 0.7
• Tolua (just the C lib, not the application) and CEGUILua libraries are no longer in our repository. —> You will need to get these as well when compiling Orxonox
• And of course lots of new bugs we don't yet know about

File:

• code/trunk/src/external/bullet/LinearMath/btQuickprof.cpp (modified) (3 diffs)

code/trunk/src/external/bullet/LinearMath/btQuickprof.cpp

@@ -1 +1 @@
 /*
 
-/***************************************************************************************************
+***************************************************************************************************
 **
 ** profile.cpp
@@ -14 +14 @@
 // Ogre (www.ogre3d.org).
 
-#include "LinearMath/btQuickprof.h"
-
-
-#ifdef USE_BT_CLOCK
+#include "btQuickprof.h"
+
+#ifndef BT_NO_PROFILE
+
 
 static btClock gProfileClock;
+
+
+#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 BT_USE_WINDOWS_TIMERS
+#define WIN32_LEAN_AND_MEAN
+#define NOWINRES
+#define NOMCX
+#define NOIME 
+
+#ifdef _XBOX
+        #include <Xtl.h>
+#else //_XBOX
+        #include <windows.h>
+#endif //_XBOX
+
+#include <time.h>
+
+
+#else //_WIN32
+#include <sys/time.h>
+#endif //_WIN32
+
+#define mymin(a,b) (a > b ? a : b)
+
+struct btClockData
+{
+
+#ifdef BT_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__
+
+};
+
+///The btClock is a portable basic clock that measures accurate time in seconds, use for profiling.
+btClock::btClock()
+{
+        m_data = new btClockData;
+#ifdef BT_USE_WINDOWS_TIMERS
+        QueryPerformanceFrequency(&m_data->mClockFrequency);
+#endif
+        reset();
+}
+
+btClock::~btClock()
+{
+        delete m_data;
+}
+
+btClock::btClock(const btClock& other)
+{
+        m_data = new btClockData;
+        *m_data = *other.m_data;
+}
+
+btClock& btClock::operator=(const btClock& other)
+{
+        *m_data = *other.m_data;
+        return *this;
+}
+
+
+        /// Resets the initial reference time.
+void btClock::reset()
+{
+#ifdef BT_USE_WINDOWS_TIMERS
+        QueryPerformanceCounter(&m_data->mStartTime);
+        m_data->mStartTick = GetTickCount();
+        m_data->mPrevElapsedTime = 0;
+#else
+#ifdef __CELLOS_LV2__
+
+        typedef uint64_t  ClockSize;
+        ClockSize newTime;
+        //__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
+        SYS_TIMEBASE_GET( newTime );
+        m_data->mStartTime = newTime;
+#else
+        gettimeofday(&m_data->mStartTime, 0);
+#endif
+#endif
+}
+
+/// Returns the time in ms since the last call to reset or since 
+/// the btClock was created.
+unsigned long int btClock::getTimeMilliseconds()
+{
+#ifdef BT_USE_WINDOWS_TIMERS
+        LARGE_INTEGER currentTime;
+        QueryPerformanceCounter(&currentTime);
+        LONGLONG elapsedTime = currentTime.QuadPart - 
+                m_data->mStartTime.QuadPart;
+                // Compute the number of millisecond ticks elapsed.
+        unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / 
+                m_data->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() - m_data->mStartTick;
+                signed long msecOff = (signed long)(msecTicks - elapsedTicks);
+                if (msecOff < -100 || msecOff > 100)
+                {
+                        // Adjust the starting time forwards.
+                        LONGLONG msecAdjustment = mymin(msecOff * 
+                                m_data->mClockFrequency.QuadPart / 1000, elapsedTime - 
+                                m_data->mPrevElapsedTime);
+                        m_data->mStartTime.QuadPart += msecAdjustment;
+                        elapsedTime -= msecAdjustment;
+
+                        // Recompute the number of millisecond ticks elapsed.
+                        msecTicks = (unsigned long)(1000 * elapsedTime / 
+                                m_data->mClockFrequency.QuadPart);
+                }
+
+                // Store the current elapsed time for adjustments next time.
+                m_data->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-m_data->mStartTime)) / dFreq);
+#else
+
+                struct timeval currentTime;
+                gettimeofday(&currentTime, 0);
+                return (currentTime.tv_sec - m_data->mStartTime.tv_sec) * 1000 + 
+                        (currentTime.tv_usec - m_data->mStartTime.tv_usec) / 1000;
+#endif //__CELLOS_LV2__
+#endif
+}
+
+        /// Returns the time in us since the last call to reset or since 
+        /// the Clock was created.
+unsigned long int btClock::getTimeMicroseconds()
+{
+#ifdef BT_USE_WINDOWS_TIMERS
+                LARGE_INTEGER currentTime;
+                QueryPerformanceCounter(&currentTime);
+                LONGLONG elapsedTime = currentTime.QuadPart - 
+                        m_data->mStartTime.QuadPart;
+
+                // Compute the number of millisecond ticks elapsed.
+                unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / 
+                        m_data->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() - m_data->mStartTick;
+                signed long msecOff = (signed long)(msecTicks - elapsedTicks);
+                if (msecOff < -100 || msecOff > 100)
+                {
+                        // Adjust the starting time forwards.
+                        LONGLONG msecAdjustment = mymin(msecOff * 
+                                m_data->mClockFrequency.QuadPart / 1000, elapsedTime - 
+                                m_data->mPrevElapsedTime);
+                        m_data->mStartTime.QuadPart += msecAdjustment;
+                        elapsedTime -= msecAdjustment;
+                }
+
+                // Store the current elapsed time for adjustments next time.
+                m_data->mPrevElapsedTime = elapsedTime;
+
+                // Convert to microseconds.
+                unsigned long usecTicks = (unsigned long)(1000000 * elapsedTime / 
+                        m_data->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-m_data->mStartTime)) / dFreq);
+#else
+
+                struct timeval currentTime;
+                gettimeofday(&currentTime, 0);
+                return (currentTime.tv_sec - m_data->mStartTime.tv_sec) * 1000000 + 
+                        (currentTime.tv_usec - m_data->mStartTime.tv_usec);
+#endif//__CELLOS_LV2__
+#endif 
+}
+
+
+
+
 
 inline void Profile_Get_Ticks(unsigned long int * ticks)
@@ -343 +562 @@
 
 
-#endif //USE_BT_CLOCK
-
+
+#endif //BT_NO_PROFILE