mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-04 00:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve performance in deep operations

Browse Source
This commit is contained in:
dfsek 2021-04-11 23:24:44 -07:00
parent 5d4bdb431b
commit 168c0ced13
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
common/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java
View File

@ -10,8 +10,8 @@ import java.util.Stack;
public class ProfilerImpl implements Profiler { public class ProfilerImpl implements Profiler {
private static final ThreadLocal<Stack<Frame>> THREAD_STACK = ThreadLocal.withInitial(Stack::new); private static final ThreadLocal<Stack<Frame>> THREAD_STACK = ThreadLocal.withInitial(Stack::new);
private static final ThreadLocal<Map<String, Timings>> TIMINGS = ThreadLocal.withInitial(HashMap::new); private static final ThreadLocal<Map<String, List<Long>>> TIMINGS = ThreadLocal.withInitial(HashMap::new);
private final List<Map<String, Timings>> accessibleThreadMaps = new ArrayList<>(); private final List<Map<String, List<Long>>> accessibleThreadMaps = new ArrayList<>();
private volatile boolean running = false; private volatile boolean running = false;
@ -21,7 +21,10 @@ public class ProfilerImpl implements Profiler {
@Override @Override
public void push(String frame) { public void push(String frame) {
if(running) THREAD_STACK.get().push(new Frame(frame)); if(running) {
Stack<Frame> stack = THREAD_STACK.get();
stack.push(new Frame(stack.size() == 0 ? frame : stack.peek().getId() + "." + frame));
}
} }
@Override @Override
@ -30,7 +33,7 @@ public class ProfilerImpl implements Profiler {
long time = System.nanoTime(); long time = System.nanoTime();
Stack<Frame> stack = THREAD_STACK.get(); Stack<Frame> stack = THREAD_STACK.get();
Map<String, Timings> timingsMap = TIMINGS.get(); Map<String, List<Long>> timingsMap = TIMINGS.get();
if(timingsMap.size() == 0) { if(timingsMap.size() == 0) {
synchronized(accessibleThreadMaps) { synchronized(accessibleThreadMaps) {
@ -38,16 +41,13 @@ public class ProfilerImpl implements Profiler {
} }
} }
Timings bottom = timingsMap.computeIfAbsent(stack.get(0).getId(), id -> new Timings());
for(int i = 1; i < stack.size(); i++) {
bottom = bottom.getSubItem(stack.get(i).getId());
}
Frame top = stack.pop(); Frame top = stack.pop();
if(!top.getId().equals(frame)) throw new MalformedStackException("Expected " + frame + ", found " + top); if((stack.size() != 0 && !top.getId().endsWith("." + frame)) || (stack.size() == 0 && !top.getId().equals(frame)))
throw new MalformedStackException("Expected " + frame + ", found " + top);
bottom.addTime(time - top.getStart()); List<Long> timings = timingsMap.computeIfAbsent(top.getId(), id -> new ArrayList<>());
timings.add(time - top.getStart());
} }
} }
@ -64,7 +64,16 @@ public class ProfilerImpl implements Profiler {
@Override @Override
public Map<String, Timings> getTimings() { public Map<String, Timings> getTimings() {
Map<String, Timings> map = new HashMap<>(); Map<String, Timings> map = new HashMap<>();
accessibleThreadMaps.forEach(map::putAll); accessibleThreadMaps.forEach(smap -> {
smap.forEach((key, list) -> {
String[] keys = key.split("\\.");
Timings timings = map.computeIfAbsent(keys[0], id -> new Timings());
for(int i = 1; i < keys.length; i++) {
timings = timings.getSubItem(keys[i]);
}
list.forEach(timings::addTime);
});
});
return map; return map;
} }
} }

2
common/src/test/java/profiler/ProfilerTest.java
View File

@ -6,7 +6,7 @@ public class ProfilerTest {
//@Test //@Test
public static void main(String... a) throws InterruptedException { public static void main(String... a) throws InterruptedException {
Profiler.INSTANCE.start(); Profiler.INSTANCE.start();
for(int i = 0; i < 100; i++) { for(int i = 0; i < 1000; i++) {
doThing(); doThing();
} }