From 66b627ef2c1d2cfd3b459ee2422a4a0c992778a4 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Mon, 9 Feb 2004 02:13:35 +0000
Subject: [PATCH] Incorporated profiles into the 15 minute dump; removed some
 vestigal constants.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2952 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../presents/server/PresentsDObjectMgr.java   | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java
index 69afc7081..892445b23 100644
--- a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java
+++ b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java
@@ -1,5 +1,5 @@
 //
-// $Id: PresentsDObjectMgr.java,v 1.38 2004/02/09 02:08:28 mdb Exp $
+// $Id: PresentsDObjectMgr.java,v 1.39 2004/02/09 02:13:35 mdb Exp $
 
 package com.threerings.presents.server;
 
@@ -609,8 +609,7 @@ public class PresentsDObjectMgr
         // summarize the objects in our dobject table
         HashMap ccount = new HashMap();
         SortableArrayList clist = new SortableArrayList();
-        Iterator iter = _objects.values().iterator();
-        while (iter.hasNext()) {
+        for (Iterator iter = _objects.values().iterator(); iter.hasNext(); ) {
             DObject obj = (DObject)iter.next();
             String clazz = obj.getClass().getName();
             int[] count = (int[])ccount.get(clazz);
@@ -633,6 +632,15 @@ public class PresentsDObjectMgr
             report.append("  ").append(clazz).append(": ").append(count);
             report.append("\n");
         }
+
+        report.append("- Unit profiles: ").append(_profiles.size());
+        report.append("\n");
+        for (Iterator iter = _profiles.keySet().iterator(); iter.hasNext(); ) {
+            String cname = (String)iter.next();
+            UnitProfile uprof = (UnitProfile)_profiles.get(cname);
+            report.append("  ").append(cname).append(" ").append(uprof);
+            report.append("\n");
+        }
     }
 
     /**
@@ -865,8 +873,8 @@ public class PresentsDObjectMgr
         public String toString ()
         {
             int count = _histo.size();
-            return "(" + _totalElapsed + "us/" + count + " = " +
-                (_totalElapsed/count) + "us avg) " +
+            return _totalElapsed + "us/" + count + " = " +
+                (_totalElapsed/count) + "us avg " +
                 StringUtil.toString(_histo.getBuckets());
         }
 
@@ -916,13 +924,6 @@ public class PresentsDObjectMgr
     /** The frequency with which we take a profiling sample. */
     protected static final int UNIT_PROFILING_INTERVAL = 100;
 
-    /** Check whether we should generate a report every 100 events. */
-    protected static final long REPORT_CHECK_PERIOD = 100;
-
-    /** Generate a report no more frequently than once per five
-     * minutes. */
-    protected static final long REPORT_PERIOD = 5 * 60 * 1000L;
-
     /** The default size of an oid list refs vector. */
     protected static final int DEFREFVEC_SIZE = 4;