From 68772fbb9ed36cff0fdbc31c919ab5225bb6b728 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 27 Jun 2007 17:39:10 +0000 Subject: [PATCH] reorder vertex data collectors --- panda/src/pstatclient/pStatClient.cxx | 10 ++++++++-- panda/src/pstatclient/pStatProperties.cxx | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/panda/src/pstatclient/pStatClient.cxx b/panda/src/pstatclient/pStatClient.cxx index 7422060856..6e4d7b96cb 100644 --- a/panda/src/pstatclient/pStatClient.cxx +++ b/panda/src/pstatclient/pStatClient.cxx @@ -1061,7 +1061,10 @@ deactivate_hook(Thread *thread) { int on_bit = ithread->_active_collectors.get_lowest_on_bit(); while (off_bit != on_bit) { off_bit = ithread->_active_collectors.get_next_higher_different_bit(on_bit); - nassertv(off_bit != on_bit); + nassertd(off_bit != on_bit) { + cerr << "Oops! off_bit = " << off_bit + << ", collectors = " << ithread->_active_collectors << "\n"; + } while (on_bit < off_bit) { // Here's an active collector. Record a data point indicating // it stops here. @@ -1098,7 +1101,10 @@ activate_hook(Thread *thread) { int on_bit = ithread->_active_collectors.get_lowest_on_bit(); while (off_bit != on_bit) { off_bit = ithread->_active_collectors.get_next_higher_different_bit(on_bit); - nassertv(off_bit != on_bit); + nassertd(off_bit != on_bit) { + cerr << "Oops! off_bit = " << off_bit + << ", collectors = " << ithread->_active_collectors << "\n"; + } while (on_bit < off_bit) { // Here's an active collector. Record a data point indicating // it resumes here. diff --git a/panda/src/pstatclient/pStatProperties.cxx b/panda/src/pstatclient/pStatProperties.cxx index 0df191392e..ced92bbd59 100644 --- a/panda/src/pstatclient/pStatProperties.cxx +++ b/panda/src/pstatclient/pStatProperties.cxx @@ -201,14 +201,14 @@ static LevelCollectorProperties level_properties[] = { { 1, "Main memory:NeverFree", { 0.2, 0.5, 0.8 } }, { 1, "Main memory:Interpreter", { 0.8, 0.2, 0.5 } }, { 1, "Vertex Data", { 1.0, 0.4, 0.0 }, "MB", 64, 1048576 }, - { 1, "Vertex Data:Small", { 0.2, 0.3, 0.4 } }, { 1, "Vertex Data:Independent", { 0.9, 0.1, 0.9 } }, + { 1, "Vertex Data:Small", { 0.2, 0.3, 0.4 } }, { 1, "Vertex Data:Pending", { 0.6, 0.8, 1.0 } }, + { 1, "Vertex Data:Resident", { 0.9, 1.0, 0.7 } }, + { 1, "Vertex Data:Compressed", { 0.5, 0.1, 0.4 } }, { 1, "Vertex Data:Disk", { 0.6, 0.9, 0.1 } }, { 1, "Vertex Data:Disk:Unused", { 0.8, 0.4, 0.5 } }, { 1, "Vertex Data:Disk:Used", { 0.2, 0.1, 0.6 } }, - { 1, "Vertex Data:Compressed", { 0.5, 0.1, 0.4 } }, - { 1, "Vertex Data:Resident", { 0.9, 1.0, 0.7 } }, { 1, "TransformStates", { 1.0, 0.5, 0.5 }, "", 5000 }, { 1, "TransformStates:On nodes", { 0.2, 0.8, 1.0 } }, { 1, "TransformStates:Cached", { 1.0, 0.0, 0.2 } },