diff --git a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java index f0b0009e6..ae4a66348 100644 --- a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java +++ b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java @@ -544,7 +544,8 @@ public class PresentsDObjectMgr int queueSize = _evqueue.size(); report.append("- Queue size: ").append(queueSize).append("\n"); report.append("- Max queue size: ").append(_current.maxQueueSize).append("\n"); - report.append("- Units executed: ").append(_current.eventCount).append("\n"); + report.append("- Units executed: ").append(_current.eventCount); + report.append(" (").append(1000*_current.eventCount/sinceLast).append("/s)\n"); if (UNIT_PROF_ENABLED) { report.append("- Unit profiles: ").append(_profiles.size()).append("\n"); diff --git a/src/java/com/threerings/presents/server/PresentsInvoker.java b/src/java/com/threerings/presents/server/PresentsInvoker.java index 5e6c97277..d02423256 100644 --- a/src/java/com/threerings/presents/server/PresentsInvoker.java +++ b/src/java/com/threerings/presents/server/PresentsInvoker.java @@ -62,7 +62,8 @@ public class PresentsInvoker extends Invoker buf.append("- Queue size: ").append(qsize).append("\n"); synchronized (this) { buf.append("- Max queue size: ").append(_maxQueueSize).append("\n"); - buf.append("- Units executed: ").append(_unitsRun).append("\n"); + buf.append("- Units executed: ").append(_unitsRun); + buf.append(" (").append(1000*_unitsRun/sinceLast).append("/s)\n"); if (_currentUnit != null) { String uname = StringUtil.safeToString(_currentUnit); buf.append("- Current unit: ").append(uname).append(" "); diff --git a/src/java/com/threerings/presents/server/net/ConnectionManager.java b/src/java/com/threerings/presents/server/net/ConnectionManager.java index 8804c44a2..50c70335b 100644 --- a/src/java/com/threerings/presents/server/net/ConnectionManager.java +++ b/src/java/com/threerings/presents/server/net/ConnectionManager.java @@ -243,12 +243,14 @@ public class ConnectionManager extends LoopingThread report.append("- Network input: "); report.append(bytesIn).append(" bytes, "); report.append(msgsIn).append(" msgs, "); + report.append(msgsIn*1000/sinceLast).append(" mps, "); long avgIn = (msgsIn == 0) ? 0 : (bytesIn/msgsIn); report.append(avgIn).append(" avg size, "); report.append(bytesIn*1000/sinceLast).append(" bps\n"); report.append("- Network output: "); report.append(bytesOut).append(" bytes, "); report.append(msgsOut).append(" msgs, "); + report.append(msgsOut*1000/sinceLast).append(" mps, "); long avgOut = (msgsOut == 0) ? 0 : (bytesOut/msgsOut); report.append(avgOut).append(" avg size, "); report.append(bytesOut*1000/sinceLast).append(" bps\n");