SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Projekte Releases Wiki Aktivität
473febc73a
Paper/nms-patches/MethodProfiler.patch

66 Zeilen
2.1 KiB
Diff
Originalformat Normale Ansicht Verlauf

Cut fluff from patch headers.
2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/MethodProfiler.java
+++ b/net/minecraft/server/MethodProfiler.java
Re-enable the vanilla debug MethodProfiler and /debug command This is highly useful for profiling vanilla code, and in some cases plugin code. It is somewhat expensive, though, which is why it was initially disabled. I chose to use a system property instead of a configuration setting because 1) the MethodProfiler is exclusive to CraftBukkit and not part of the general API (the timings system is the general API equivalent), and 2) using a static final boolean property _may_ allow the JITter to optimize out the methods when disabled (though I'm not sure of it). There are several changes to fix cases where the profiler code was broken slightly by other craftbukkit changes. All of cases have been fixed, except for the block entity ticking one, due to the cost of the getSimpleName call. For that, a ticking entry is used instead, so that time spent actually ticking the block entities can be compared with time processing the list. This (effectively) reverts 7dde6cc5663e1f6b84f549c54a47bc623b49fdf1.
2017-01-19 02:42:35 +01:00
@@ -12,6 +12,7 @@
Update to Minecraft 1.8 For more information please see http://www.spigotmc.org/
2014-11-25 22:32:16 +01:00
public class MethodProfiler {
Update to Minecraft 1.8.3
2015-02-26 23:41:06 +01:00
Re-enable the vanilla debug MethodProfiler and /debug command This is highly useful for profiling vanilla code, and in some cases plugin code. It is somewhat expensive, though, which is why it was initially disabled. I chose to use a system property instead of a configuration setting because 1) the MethodProfiler is exclusive to CraftBukkit and not part of the general API (the timings system is the general API equivalent), and 2) using a static final boolean property _may_ allow the JITter to optimize out the methods when disabled (though I'm not sure of it). There are several changes to fix cases where the profiler code was broken slightly by other craftbukkit changes. All of cases have been fixed, except for the block entity ticking one, due to the cost of the getSimpleName call. For that, a ticking entry is used instead, so that time spent actually ticking the block entities can be compared with time processing the list. This (effectively) reverts 7dde6cc5663e1f6b84f549c54a47bc623b49fdf1.
2017-01-19 02:42:35 +01:00
+ public static final boolean ENABLED = Boolean.getBoolean("enableDebugMethodProfiler"); // CraftBukkit - disable unless specified in JVM arguments
private static final Logger b = LogManager.getLogger();
private final List<String> c = Lists.newArrayList();
private final List<Long> d = Lists.newArrayList();
@@ -22,12 +23,14 @@
Update to Minecraft 1.8 For more information please see http://www.spigotmc.org/
2014-11-25 22:32:16 +01:00
public MethodProfiler() {}
public void a() {
Re-enable the vanilla debug MethodProfiler and /debug command This is highly useful for profiling vanilla code, and in some cases plugin code. It is somewhat expensive, though, which is why it was initially disabled. I chose to use a system property instead of a configuration setting because 1) the MethodProfiler is exclusive to CraftBukkit and not part of the general API (the timings system is the general API equivalent), and 2) using a static final boolean property _may_ allow the JITter to optimize out the methods when disabled (though I'm not sure of it). There are several changes to fix cases where the profiler code was broken slightly by other craftbukkit changes. All of cases have been fixed, except for the block entity ticking one, due to the cost of the getSimpleName call. For that, a ticking entry is used instead, so that time spent actually ticking the block entities can be compared with time processing the list. This (effectively) reverts 7dde6cc5663e1f6b84f549c54a47bc623b49fdf1.
2017-01-19 02:42:35 +01:00
+ if (!ENABLED) return; // CraftBukkit
this.f.clear();
this.e = "";
this.c.clear();
Update to Minecraft 1.8 For more information please see http://www.spigotmc.org/
2014-11-25 22:32:16 +01:00
}
public void a(String s) {
Re-enable the vanilla debug MethodProfiler and /debug command This is highly useful for profiling vanilla code, and in some cases plugin code. It is somewhat expensive, though, which is why it was initially disabled. I chose to use a system property instead of a configuration setting because 1) the MethodProfiler is exclusive to CraftBukkit and not part of the general API (the timings system is the general API equivalent), and 2) using a static final boolean property _may_ allow the JITter to optimize out the methods when disabled (though I'm not sure of it). There are several changes to fix cases where the profiler code was broken slightly by other craftbukkit changes. All of cases have been fixed, except for the block entity ticking one, due to the cost of the getSimpleName call. For that, a ticking entry is used instead, so that time spent actually ticking the block entities can be compared with time processing the list. This (effectively) reverts 7dde6cc5663e1f6b84f549c54a47bc623b49fdf1.
2017-01-19 02:42:35 +01:00
+ if (!ENABLED) return; // CraftBukkit
if (this.a) {
if (this.e.length() > 0) {
this.e = this.e + ".";
@@ -40,6 +43,7 @@
Update to Minecraft 1.8 For more information please see http://www.spigotmc.org/
2014-11-25 22:32:16 +01:00
}
public void b() {
Re-enable the vanilla debug MethodProfiler and /debug command This is highly useful for profiling vanilla code, and in some cases plugin code. It is somewhat expensive, though, which is why it was initially disabled. I chose to use a system property instead of a configuration setting because 1) the MethodProfiler is exclusive to CraftBukkit and not part of the general API (the timings system is the general API equivalent), and 2) using a static final boolean property _may_ allow the JITter to optimize out the methods when disabled (though I'm not sure of it). There are several changes to fix cases where the profiler code was broken slightly by other craftbukkit changes. All of cases have been fixed, except for the block entity ticking one, due to the cost of the getSimpleName call. For that, a ticking entry is used instead, so that time spent actually ticking the block entities can be compared with time processing the list. This (effectively) reverts 7dde6cc5663e1f6b84f549c54a47bc623b49fdf1.
2017-01-19 02:42:35 +01:00
+ if (!ENABLED) return; // CraftBukkit
if (this.a) {
long i = System.nanoTime();
long j = ((Long) this.d.remove(this.d.size() - 1)).longValue();
@@ -62,7 +66,7 @@
Update to Minecraft 1.8 For more information please see http://www.spigotmc.org/
2014-11-25 22:32:16 +01:00
}
Update to Minecraft 1.8.3
2015-02-26 23:41:06 +01:00
public List<MethodProfiler.ProfilerInfo> b(String s) {
Update to Minecraft 1.8 For more information please see http://www.spigotmc.org/
2014-11-25 22:32:16 +01:00
- if (!this.a) {
Re-enable the vanilla debug MethodProfiler and /debug command This is highly useful for profiling vanilla code, and in some cases plugin code. It is somewhat expensive, though, which is why it was initially disabled. I chose to use a system property instead of a configuration setting because 1) the MethodProfiler is exclusive to CraftBukkit and not part of the general API (the timings system is the general API equivalent), and 2) using a static final boolean property _may_ allow the JITter to optimize out the methods when disabled (though I'm not sure of it). There are several changes to fix cases where the profiler code was broken slightly by other craftbukkit changes. All of cases have been fixed, except for the block entity ticking one, due to the cost of the getSimpleName call. For that, a ticking entry is used instead, so that time spent actually ticking the block entities can be compared with time processing the list. This (effectively) reverts 7dde6cc5663e1f6b84f549c54a47bc623b49fdf1.
2017-01-19 02:42:35 +01:00
+ if (!ENABLED || !this.a) { // CraftBukkit
return Collections.emptyList();
} else {
long i = this.f.containsKey("root") ? ((Long) this.f.get("root")).longValue() : 0L;
@@ -128,11 +132,13 @@
Update to Minecraft 1.8 For more information please see http://www.spigotmc.org/
2014-11-25 22:32:16 +01:00
}
public void c(String s) {
Re-enable the vanilla debug MethodProfiler and /debug command This is highly useful for profiling vanilla code, and in some cases plugin code. It is somewhat expensive, though, which is why it was initially disabled. I chose to use a system property instead of a configuration setting because 1) the MethodProfiler is exclusive to CraftBukkit and not part of the general API (the timings system is the general API equivalent), and 2) using a static final boolean property _may_ allow the JITter to optimize out the methods when disabled (though I'm not sure of it). There are several changes to fix cases where the profiler code was broken slightly by other craftbukkit changes. All of cases have been fixed, except for the block entity ticking one, due to the cost of the getSimpleName call. For that, a ticking entry is used instead, so that time spent actually ticking the block entities can be compared with time processing the list. This (effectively) reverts 7dde6cc5663e1f6b84f549c54a47bc623b49fdf1.
2017-01-19 02:42:35 +01:00
+ if (!ENABLED) return; // CraftBukkit
this.b();
this.a(s);
Update to Minecraft 1.8 For more information please see http://www.spigotmc.org/
2014-11-25 22:32:16 +01:00
}
public String c() {
Re-enable the vanilla debug MethodProfiler and /debug command This is highly useful for profiling vanilla code, and in some cases plugin code. It is somewhat expensive, though, which is why it was initially disabled. I chose to use a system property instead of a configuration setting because 1) the MethodProfiler is exclusive to CraftBukkit and not part of the general API (the timings system is the general API equivalent), and 2) using a static final boolean property _may_ allow the JITter to optimize out the methods when disabled (though I'm not sure of it). There are several changes to fix cases where the profiler code was broken slightly by other craftbukkit changes. All of cases have been fixed, except for the block entity ticking one, due to the cost of the getSimpleName call. For that, a ticking entry is used instead, so that time spent actually ticking the block entities can be compared with time processing the list. This (effectively) reverts 7dde6cc5663e1f6b84f549c54a47bc623b49fdf1.
2017-01-19 02:42:35 +01:00
+ if (!ENABLED) return "[DISABLED]"; // CraftBukkit
return this.c.size() == 0 ? "[UNKNOWN]" : (String) this.c.get(this.c.size() - 1);
Update to Minecraft 1.8.3
2015-02-26 23:41:06 +01:00
}
Re-enable the vanilla debug MethodProfiler and /debug command This is highly useful for profiling vanilla code, and in some cases plugin code. It is somewhat expensive, though, which is why it was initially disabled. I chose to use a system property instead of a configuration setting because 1) the MethodProfiler is exclusive to CraftBukkit and not part of the general API (the timings system is the general API equivalent), and 2) using a static final boolean property _may_ allow the JITter to optimize out the methods when disabled (though I'm not sure of it). There are several changes to fix cases where the profiler code was broken slightly by other craftbukkit changes. All of cases have been fixed, except for the block entity ticking one, due to the cost of the getSimpleName call. For that, a ticking entry is used instead, so that time spent actually ticking the block entities can be compared with time processing the list. This (effectively) reverts 7dde6cc5663e1f6b84f549c54a47bc623b49fdf1.
2017-01-19 02:42:35 +01:00
@@ -152,7 +158,7 @@
Update to Minecraft 1.8.3
2015-02-26 23:41:06 +01:00
return methodprofiler_profilerinfo.a < this.a ? -1 : (methodprofiler_profilerinfo.a > this.a ? 1 : methodprofiler_profilerinfo.c.compareTo(this.c));
}
- public int compareTo(Object object) {
Update to Minecraft 1.9
2016-02-29 22:32:46 +01:00
+ public int compareTo(MethodProfiler.ProfilerInfo object) { // CraftBukkit: decompile error
Update to Minecraft 1.8.3
2015-02-26 23:41:06 +01:00
return this.a((MethodProfiler.ProfilerInfo) object);
}
Update to Minecraft 1.8 For more information please see http://www.spigotmc.org/
2014-11-25 22:32:16 +01:00
}
In neuem Issue referenzieren Permalink kopieren