From 136f12d71ca9aaee225c74662ce4baceb701ecd3 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Tue, 28 Feb 2006 00:25:45 +0000
Subject: [PATCH] minor pstats readjustments

---
 panda/src/display/graphicsEngine.cxx | 7 ++++++-
 panda/src/display/graphicsEngine.h   | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/panda/src/display/graphicsEngine.cxx b/panda/src/display/graphicsEngine.cxx
index 1ab2a65bb9..815ed38043 100644
--- a/panda/src/display/graphicsEngine.cxx
+++ b/panda/src/display/graphicsEngine.cxx
@@ -47,7 +47,9 @@
 
 PStatCollector GraphicsEngine::_wait_pcollector("Wait");
 PStatCollector GraphicsEngine::_cycle_pcollector("App:Cycle");
-PStatCollector GraphicsEngine::_app_pcollector("App");
+PStatCollector GraphicsEngine::_app_pcollector("App:Show code");
+PStatCollector GraphicsEngine::_render_frame_pcollector("App:render_frame");
+PStatCollector GraphicsEngine::_do_frame_pcollector("*:do_frame");
 PStatCollector GraphicsEngine::_yield_pcollector("App:Yield");
 PStatCollector GraphicsEngine::_cull_pcollector("Cull");
 PStatCollector GraphicsEngine::_draw_pcollector("Draw");
@@ -466,6 +468,7 @@ render_frame() {
   // Anything that happens outside of GraphicsEngine::render_frame()
   // is deemed to be App.
 #ifdef DO_PSTATS
+  _render_frame_pcollector.start();
   if (_app_pcollector.is_started()) {
     _app_pcollector.stop();
   }
@@ -611,6 +614,7 @@ render_frame() {
   // Anything that happens outside of GraphicsEngine::render_frame()
   // is deemed to be App.
   _app_pcollector.start();
+  _render_frame_pcollector.stop();
 }
 
 
@@ -1695,6 +1699,7 @@ resort_windows() {
 ////////////////////////////////////////////////////////////////////
 void GraphicsEngine::WindowRenderer::
 do_frame(GraphicsEngine *engine) {
+  PStatTimer timer(engine->_do_frame_pcollector);
   MutexHolder holder(_wl_lock);
 
   do_callbacks(CB_pre_frame);
diff --git a/panda/src/display/graphicsEngine.h b/panda/src/display/graphicsEngine.h
index c687fe8a59..dd1737db6f 100644
--- a/panda/src/display/graphicsEngine.h
+++ b/panda/src/display/graphicsEngine.h
@@ -253,6 +253,8 @@ private:
   static PStatCollector _wait_pcollector;
   static PStatCollector _cycle_pcollector;
   static PStatCollector _app_pcollector;
+  static PStatCollector _render_frame_pcollector;
+  static PStatCollector _do_frame_pcollector;
   static PStatCollector _yield_pcollector;
   static PStatCollector _cull_pcollector;
   static PStatCollector _draw_pcollector;