TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

don't call PstatCollector.is_started() if opt 4

Browse Source
This commit is contained in:
Joseph Lee 2004-03-03 03:14:56 +00:00
parent 6a0476ebcb
commit 02a1103540
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panda/src/display/graphicsEngine.cxx
View File

@ -28,6 +28,7 @@
#include "clockObject.h" #include "clockObject.h"
#include "pStatTimer.h" #include "pStatTimer.h"
#include "pStatClient.h" #include "pStatClient.h"
#include "pStatCollector.h"
#include "mutexHolder.h" #include "mutexHolder.h"
#include "string_utils.h" #include "string_utils.h"
@ -95,9 +96,11 @@ GraphicsEngine(Pipeline *pipeline) :
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
GraphicsEngine:: GraphicsEngine::
~GraphicsEngine() { ~GraphicsEngine() {
#ifdef DO_PSTATS
if (_app_pcollector.is_started()) { if (_app_pcollector.is_started()) {
_app_pcollector.stop(); _app_pcollector.stop();
} }
#endif
remove_all_windows(); remove_all_windows();
} }
@ -428,9 +431,11 @@ void GraphicsEngine::
render_frame() { render_frame() {
// Anything that happens outside of GraphicsEngine::render_frame() // Anything that happens outside of GraphicsEngine::render_frame()
// is deemed to be App. // is deemed to be App.
#ifdef DO_PSTATS
if (_app_pcollector.is_started()) { if (_app_pcollector.is_started()) {
_app_pcollector.stop(); _app_pcollector.stop();
} }
#endif
// We hold the GraphicsEngine mutex while we wait for all of the // We hold the GraphicsEngine mutex while we wait for all of the
// threads. Doing this puts us at risk for deadlock if any of the // threads. Doing this puts us at risk for deadlock if any of the