From 27d85ea8a68365ea197da76f88cfe8b31198349f Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 1 Jul 2004 17:18:07 +0000
Subject: [PATCH] fix for standalone programs

---
 panda/src/express/memoryUsage.cxx              | 17 +++++++++++++----
 panda/src/express/memoryUsagePointerCounts.cxx |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/panda/src/express/memoryUsage.cxx b/panda/src/express/memoryUsage.cxx
index 03c41c3255..a7fb8467ed 100644
--- a/panda/src/express/memoryUsage.cxx
+++ b/panda/src/express/memoryUsage.cxx
@@ -419,6 +419,7 @@ get_global_ptr() {
   if (_global_ptr == (MemoryUsage *)NULL) {
     _global_ptr = new MemoryUsage;
   }
+
   return _global_ptr;
 }
 
@@ -437,7 +438,6 @@ ns_record_pointer(ReferenceCount *ptr) {
     _recursion_protect = true;
     pair<Table::iterator, bool> insert_result =
       _table.insert(Table::value_type((void *)ptr, MemoryInfo()));
-    _recursion_protect = false;
     
     // This shouldn't fail.
     assert(insert_result.first != _table.end());
@@ -451,7 +451,7 @@ ns_record_pointer(ReferenceCount *ptr) {
     // We shouldn't already have a ReferenceCount pointer.
     if ((info._flags & MemoryInfo::F_got_ref) != 0) {
       express_cat.error()
-        << "Pointer " << (void *)ptr << " recorded twice!\n";
+        << "ReferenceCount pointer " << (void *)ptr << " recorded twice!\n";
     }
 
     info._void_ptr = (void *)ptr;
@@ -461,6 +461,11 @@ ns_record_pointer(ReferenceCount *ptr) {
     info._time = TrueClock::get_ptr()->get_long_time();
     info._freeze_index = _freeze_index;
     info._flags |= (MemoryInfo::F_reconsider_dynamic_type | MemoryInfo::F_got_ref);
+
+    // We close the recursion_protect flag all the way down here, so
+    // that we also protect ourselves against a possible recursive
+    // call in TrueClock::get_ptr().
+    _recursion_protect = false;
   }
 }
 
@@ -603,7 +608,6 @@ ns_record_void_pointer(void *ptr, size_t size) {
     _recursion_protect = true;
     pair<Table::iterator, bool> insert_result =
       _table.insert(Table::value_type((void *)ptr, MemoryInfo()));
-    _recursion_protect = false;
 
     assert(insert_result.first != _table.end());
 
@@ -616,7 +620,7 @@ ns_record_void_pointer(void *ptr, size_t size) {
     // We shouldn't already have a void pointer.
     if ((info._flags & MemoryInfo::F_got_void) != 0) {
       express_cat.error()
-        << "Pointer " << (void *)ptr << " recorded twice!\n";
+        << "Void pointer " << (void *)ptr << " recorded twice!\n";
     }
 
     if (info._freeze_index == _freeze_index) {
@@ -631,6 +635,11 @@ ns_record_void_pointer(void *ptr, size_t size) {
     info._time = TrueClock::get_ptr()->get_long_time();
     info._freeze_index = _freeze_index;
     info._flags |= (MemoryInfo::F_got_void | MemoryInfo::F_size_known);
+
+    // We close the recursion_protect flag all the way down here, so
+    // that we also protect ourselves against a possible recursive
+    // call in TrueClock::get_ptr().
+    _recursion_protect = false;
   }
 }
 
diff --git a/panda/src/express/memoryUsagePointerCounts.cxx b/panda/src/express/memoryUsagePointerCounts.cxx
index eb217969af..3487788072 100644
--- a/panda/src/express/memoryUsagePointerCounts.cxx
+++ b/panda/src/express/memoryUsagePointerCounts.cxx
@@ -48,7 +48,7 @@ output(ostream &out) const {
   if (_unknown_size_count < _count) {
     out << ", ";
     output_bytes(out, _size);
-    out << ", ";
+    out << ", avg ";
     output_bytes(out, _size / (_count - _unknown_size_count));
     out << " each";