Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disable CProfileManager, might reduce some multi-threading conflicts

Browse Source
This commit is contained in:
erwin coumans
2016-07-19 15:55:52 -07:00
parent 2302709e2d
commit 25a1714754
4 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/Collision/CollisionTutorialBullet2.cpp
View File

@@ -265,8 +265,9 @@ public:
virtual void stepSimulation(float deltaTime) virtual void stepSimulation(float deltaTime)
{ {
#ifndef BT_NO_PROFILE
CProfileManager::Reset(); CProfileManager::Reset();
#endif
@@ -314,7 +315,9 @@ public:
m_app->m_renderer->writeTransforms(); m_app->m_renderer->writeTransforms();
#ifndef BT_NO_PROFILE
CProfileManager::Increment_Frame_Counter(); CProfileManager::Increment_Frame_Counter();
#endif
} }
virtual void renderScene() virtual void renderScene()
{ {

7
examples/ExampleBrowser/GwenGUISupport/GwenProfileWindow.cpp
View File

@@ -4,7 +4,7 @@
#include "LinearMath/btQuickprof.h" #include "LinearMath/btQuickprof.h"
#ifndef BT_NO_PROFILE
class MyProfileWindow : public Gwen::Controls::WindowControl class MyProfileWindow : public Gwen::Controls::WindowControl
@@ -42,8 +42,9 @@ protected:
} }
public: public:
CProfileIterator* profIter; CProfileIterator* profIter;
class MyMenuItems* m_menuItems; class MyMenuItems* m_menuItems;
MyProfileWindow ( Gwen::Controls::Base* pParent) MyProfileWindow ( Gwen::Controls::Base* pParent)
: Gwen::Controls::WindowControl( pParent ), : Gwen::Controls::WindowControl( pParent ),
@@ -304,3 +305,5 @@ void destroyProfileWindow(MyProfileWindow* window)
CProfileManager::Release_Iterator(window->profIter); CProfileManager::Release_Iterator(window->profIter);
delete window; delete window;
} }
#endif //BT_NO_PROFILE

8
src/LinearMath/btQuickprof.cpp
View File

@@ -15,11 +15,8 @@
#include "btQuickprof.h" #include "btQuickprof.h"
#ifndef BT_NO_PROFILE
static btClock gProfileClock;
#ifdef __CELLOS_LV2__ #ifdef __CELLOS_LV2__
#include <sys/sys_time.h> #include <sys/sys_time.h>
@@ -250,6 +247,10 @@ btScalar btClock::getTimeSeconds()
return btScalar(getTimeMicroseconds()) * microseconds_to_seconds; return btScalar(getTimeMicroseconds()) * microseconds_to_seconds;
} }
#ifndef BT_NO_PROFILE
static btClock gProfileClock;
inline void Profile_Get_Ticks(unsigned long int * ticks) inline void Profile_Get_Ticks(unsigned long int * ticks)
@@ -265,7 +266,6 @@ inline float Profile_Get_Tick_Rate(void)
} }
/*************************************************************************************************** /***************************************************************************************************
** **
** CProfileNode ** CProfileNode

25
src/LinearMath/btQuickprof.h
View File

@@ -15,18 +15,7 @@
#ifndef BT_QUICK_PROF_H #ifndef BT_QUICK_PROF_H
#define BT_QUICK_PROF_H #define BT_QUICK_PROF_H
//To disable built-in profiling, please comment out next line
//#define BT_NO_PROFILE 1
#ifndef BT_NO_PROFILE
#include <stdio.h>//@todo remove this, backwards compatibility
#include "btScalar.h" #include "btScalar.h"
#include "btAlignedAllocator.h"
#include <new>
#define USE_BT_CLOCK 1 #define USE_BT_CLOCK 1
#ifdef USE_BT_CLOCK #ifdef USE_BT_CLOCK
@@ -64,6 +53,20 @@ private:
#endif //USE_BT_CLOCK #endif //USE_BT_CLOCK
//To disable built-in profiling, please comment out next line
#define BT_NO_PROFILE 1
#ifndef BT_NO_PROFILE
#include <stdio.h>//@todo remove this, backwards compatibility
#include "btAlignedAllocator.h"
#include <new>
///A node in the Profile Hierarchy Tree ///A node in the Profile Hierarchy Tree