OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-16 14:33:09 +01:00
Code Issues Projects Releases Packages Wiki Activity

Timings v2: Start methods return self for use in try-with-resources

Browse source 
try (Timing ignored = timing) {
  // Code to time
}
// auto stops timing, even if you return in 42 other places in the block
This commit is contained in:
Aikar 2016-05-15 17:34:26 -04:00
parent b9c321ff21
commit 8e62fb709b
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Spigot-API-Patches/Timings-v2.patch
View file

@ -27,13 +27,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ +
+ @Override + @Override
+ public void startTiming() { + public Timing startTiming() {
+ if (TimingsManager.needsFullReset) { + if (TimingsManager.needsFullReset) {
+ TimingsManager.resetTimings(); + TimingsManager.resetTimings();
+ } else if (TimingsManager.needsRecheckEnabled) { + } else if (TimingsManager.needsRecheckEnabled) {
+ TimingsManager.recheckEnabled(); + TimingsManager.recheckEnabled();
+ } + }
+ super.startTiming(); + return super.startTiming();
+ } + }
+ +
+ @Override + @Override
@ -122,8 +122,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+public final class NullTimingHandler implements Timing { +public final class NullTimingHandler implements Timing {
+ @Override + @Override
+ public void startTiming() { + public Timing startTiming() {
+ + return this;
+ } + }
+ +
+ @Override + @Override
@ -132,8 +132,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ +
+ @Override + @Override
+ public void startTimingIfSync() { + public Timing startTimingIfSync() {
+ + return this;
+ } + }
+ +
+ @Override + @Override
@ -281,21 +281,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ /** + /**
+ * Starts timing the execution until {@link #stopTiming()} is called. + * Starts timing the execution until {@link #stopTiming()} is called.
+ */ + */
+ public void startTiming(); + Timing startTiming();
+ +
+ /** + /**
+ * <p>Stops timing and records the data. Propagates the data up to group handlers.</p> + * <p>Stops timing and records the data. Propagates the data up to group handlers.</p>
+ * + *
+ * Will automatically be called when this Timing is used with try-with-resources + * Will automatically be called when this Timing is used with try-with-resources
+ */ + */
+ public void stopTiming(); + void stopTiming();
+ +
+ /** + /**
+ * Starts timing the execution until {@link #stopTiming()} is called. + * Starts timing the execution until {@link #stopTiming()} is called.
+ * + *
+ * But only if we are on the primary thread. + * But only if we are on the primary thread.
+ */ + */
+ public void startTimingIfSync(); + Timing startTimingIfSync();
+ +
+ /** + /**
+ * <p>Stops timing and records the data. Propagates the data up to group handlers.</p> + * <p>Stops timing and records the data. Propagates the data up to group handlers.</p>
@ -304,12 +304,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * + *
+ * But only if we are on the primary thread. + * But only if we are on the primary thread.
+ */ + */
+ public void stopTimingIfSync(); + void stopTimingIfSync();
+ +
+ /** + /**
+ * Stops timing and disregards current timing data. + * Stops timing and disregards current timing data.
+ */ + */
+ public void abort(); + void abort();
+ +
+ /** + /**
+ * Used internally to get the actual backing Handler in the case of delegated Handlers + * Used internally to get the actual backing Handler in the case of delegated Handlers
@ -523,10 +523,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ +
+ @Override + @Override
+ public void startTimingIfSync() { + public Timing startTimingIfSync() {
+ if (Bukkit.isPrimaryThread()) { + if (Bukkit.isPrimaryThread()) {
+ startTiming(); + startTiming();
+ } + }
+ return this;
+ } + }
+ +
+ @Override + @Override
@ -536,12 +537,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ } + }
+ +
+ public void startTiming() { + public Timing startTiming() {
+ if (enabled && ++timingDepth == 1) { + if (enabled && ++timingDepth == 1) {
+ start = System.nanoTime(); + start = System.nanoTime();
+ parent = TimingsManager.CURRENT; + parent = TimingsManager.CURRENT;
+ TimingsManager.CURRENT = this; + TimingsManager.CURRENT = this;
+ } + }
+ return this;
+ } + }
+ +
+ public void stopTiming() { + public void stopTiming() {
@ -2167,9 +2169,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ +
+ @Override + @Override
+ public void startTiming() { + public Timing startTiming() {
+ checkThread(); + checkThread();
+ super.startTiming(); + return super.startTiming();
+ } + }
+ +
+ @Override + @Override