Add script event timing stats to queue.stats

Quick, easy, and accurate statistics on script event fire times.
DenizenScript · Feb 13, 2015 · 890abbe · 890abbe
1 parent a9ea887
commit 890abbe
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizencore/events/ScriptEvent.java b/src/main/java/net/aufdemrand/denizencore/events/ScriptEvent.java
@@ -30,6 +30,10 @@ public static void registerScriptEvent(ScriptEvent event) {
         events.add(event);
     }
 
+    public long fires = 0;
+    public long scriptFires = 0;
+    public long nanoTimes = 0;
+
     public static class ScriptPath {
 
         ScriptContainer container;
@@ -166,6 +170,7 @@ public void reset() {
     }
 
     public void fire() {
+        fires++;
         for (ScriptPath path: eventPaths) {
             if (matchesScript(this, path.container, path.event)) {
                 try {
@@ -179,6 +184,7 @@ public void fire() {
     }
 
     public void run(ScriptContainer script, String event) {
+        scriptFires++;
         HashMap<String, dObject> context = getContext();
         dB.echoDebug(script, "<Y>Running script event '<A>" + getName() + "<Y>', event='<A>" + event + "<Y>'"
                 + " for script '<A>" + script.getName() + "<Y>'");
@@ -193,6 +199,7 @@ public void run(ScriptContainer script, String event) {
             queue.addContext(entry.getKey(), entry.getValue());
         }
         queue.start();
+        nanoTimes += System.nanoTime() - queue.startTime;
         List<String> determinations = DetermineCommand.getOutcome(id);
         if (determinations != null) {
             for (String determination : determinations) {

diff --git a/src/main/java/net/aufdemrand/denizencore/scripts/queues/ScriptQueue.java b/src/main/java/net/aufdemrand/denizencore/scripts/queues/ScriptQueue.java
@@ -7,6 +7,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import net.aufdemrand.denizencore.events.ScriptEvent;
 import net.aufdemrand.denizencore.objects.*;
 import net.aufdemrand.denizencore.objects.properties.Property;
 import net.aufdemrand.denizencore.objects.properties.PropertyParser;
@@ -40,10 +41,18 @@ public abstract class ScriptQueue implements Debuggable, dObject {
      * @return stats
      */
     public static String _getStats() {
+        StringBuilder stats = new StringBuilder();
+        for (ScriptEvent event: ScriptEvent.events) {
+            stats.append("Event '" + event.getName() + "' ran "
+                    + event.fires + " times (" + event.scriptFires + " script fires)"
+                    + ", totalling " + ((float)event.nanoTimes / 1000000f) + "ms, averaging "
+                    + ((float)event.nanoTimes / 1000000f / (float)event.fires) + "ms per event or " +
+                    + ((float)event.nanoTimes / 1000000f / (float)event.scriptFires) + "ms per script.\n");
+        }
         return "Total number of queues created: "
                 + total_queues
                 + ", currently active queues: "
-                + _queues.size() +  ".";
+                + _queues.size() +  ",\n" + stats.toString();
     }
 
 
@@ -456,7 +465,7 @@ public TimedQueue forceToTimed(Duration delay) {
 
     private Class<? extends ScriptQueue> cachedClass;
 
-    private long startTime = 0;
+    public long startTime = 0;
 
     private long startTimeMilli = 0;