added aggregated profiler

Author: kristofer.karlsson

contrib/j2se-util/src/se/krka/kahlua/profiler/AggregatingProfiler.java

@@ -0,0 +1,31 @@
+package se.krka.kahlua.profiler;
+
+import java.util.List;
+import java.util.Map;
+
+public class AggregatingProfiler implements Profiler {
+	private final StacktraceCounter root = new StacktraceCounter();
+
+	public AggregatingProfiler() {
+	}
+
+	public synchronized void getSample(List<StacktraceElement> list, long time) {
+		root.addTime(time);
+
+		StacktraceCounter counter = root;
+		int n = list.size() - 1;
+		while (n > 0) {
+			StacktraceElement childElement = list.get(n);
+			StacktraceCounter childCounter = counter.getOrCreateChild(childElement);
+
+			childCounter.addTime(time);
+
+			counter = childCounter;
+			n--;
+		}
+	}
+
+	public void prettyPrint() {
+		root.prettyPrint("Total", "");
+	}
+}

contrib/j2se-util/src/se/krka/kahlua/profiler/StacktraceCounter.java

@@ -0,0 +1,29 @@
+package se.krka.kahlua.profiler;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class StacktraceCounter {
+	private final Map<StacktraceElement, StacktraceCounter> children = new HashMap<StacktraceElement, StacktraceCounter>();
+	private long time = 0;
+
+	public void addTime(long time) {
+		this.time += time;
+	}
+
+	public StacktraceCounter getOrCreateChild(StacktraceElement childElement) {
+		StacktraceCounter stacktraceCounter = children.get(childElement);
+		if (stacktraceCounter == null) {
+			stacktraceCounter = new StacktraceCounter();
+			children.put(childElement, stacktraceCounter);
+		}
+		return stacktraceCounter;
+	}
+
+	public void prettyPrint(String name, String indent) {
+		System.out.println(indent + name + ": " + time);
+		for (Map.Entry<StacktraceElement, StacktraceCounter> entry : children.entrySet()) {
+			entry.getValue().prettyPrint(entry.getKey().toString(), indent + "  ");
+		}
+	}
+}

contrib/j2se-util/src/se/krka/kahlua/profiler/StacktraceElement.java

@@ -21,4 +21,29 @@ public int getLine() {
 	public String getSource() {
 		return prototype.name;
 	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (!(o instanceof StacktraceElement)) return false;
+
+		StacktraceElement that = (StacktraceElement) o;
+
+		if (pc != that.pc) return false;
+		if (!prototype.equals(that.prototype)) return false;
+
+		return true;
+	}
+
+	@Override
+	public int hashCode() {
+		int result = pc;
+		result = 31 * result + prototype.hashCode();
+		return result;
+	}
+
+	@Override
+	public String toString() {
+		return getSource() + ":" + getLine();
+	}
 }

contrib/j2se-util/test/se/krka/kahlua/profiler/DumpProfilerTest.java

@@ -24,11 +24,11 @@ public void simpleTest() throws IOException {
 						"foo()",
 				"test.lua",
 				state.getEnvironment());
-		StringWriter writer = new StringWriter();
-		Sampler sampler = new Sampler(state, 1, new DumpProfiler(writer));
+		AggregatingProfiler profiler = new AggregatingProfiler();
+		Sampler sampler = new Sampler(state, 1, profiler);
 		sampler.start();
 		state.pcall(fun);
 		sampler.stop();
-		System.out.println(writer.getBuffer().toString());
+		profiler.prettyPrint();
 	}
 }