|
|
|
@@ -38,10 +38,10 @@ index b83e2c5a0a094002d12aee55ec0cf8d12bf33f3e..b5835fa536f90b7f88a5ee4df78733cf
|
|
|
|
options.overview = "src/main/javadoc/overview.html"
|
|
|
|
options.overview = "src/main/javadoc/overview.html"
|
|
|
|
options.use()
|
|
|
|
options.use()
|
|
|
|
diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
|
|
|
|
diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
|
|
|
|
index 34e43e56ccc663e05b9cae36643e8df5eee5cb17..2c15b67149d014fdce2dd74a550013d83b6e44c8 100644
|
|
|
|
index 8f29c1561ba5916cb5634392edd8bd2a5a294a51..6fbc64e0f214d0c8e5afcbe385e414a4e1fe1c72 100644
|
|
|
|
--- a/src/main/java/co/aikar/timings/TimedEventExecutor.java
|
|
|
|
--- a/src/main/java/co/aikar/timings/TimedEventExecutor.java
|
|
|
|
+++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
|
|
|
|
+++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
|
|
|
|
@@ -76,9 +76,9 @@ public class TimedEventExecutor implements EventExecutor {
|
|
|
|
@@ -77,9 +77,9 @@ public class TimedEventExecutor implements EventExecutor {
|
|
|
|
executor.execute(listener, event);
|
|
|
|
executor.execute(listener, event);
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -54,10 +54,10 @@ index 34e43e56ccc663e05b9cae36643e8df5eee5cb17..2c15b67149d014fdce2dd74a550013d8
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java
|
|
|
|
diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java
|
|
|
|
index a21e5ead5024fd0058c5e3302d8201dd249d32bc..505908e987a032a801ae03d7fb020dfb662bf81b 100644
|
|
|
|
index 7514fad26f955329f8bf17ff17db75f0c8301ee5..1d866e980abc542bdfee1ce082cd9cdd7761e9f7 100644
|
|
|
|
--- a/src/main/java/co/aikar/timings/Timing.java
|
|
|
|
--- a/src/main/java/co/aikar/timings/Timing.java
|
|
|
|
+++ b/src/main/java/co/aikar/timings/Timing.java
|
|
|
|
+++ b/src/main/java/co/aikar/timings/Timing.java
|
|
|
|
@@ -36,6 +36,7 @@ public interface Timing extends AutoCloseable {
|
|
|
|
@@ -39,6 +39,7 @@ public interface Timing extends AutoCloseable {
|
|
|
|
* @return Timing
|
|
|
|
* @return Timing
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@NotNull
|
|
|
|
@NotNull
|
|
|
|
@@ -65,7 +65,7 @@ index a21e5ead5024fd0058c5e3302d8201dd249d32bc..505908e987a032a801ae03d7fb020dfb
|
|
|
|
Timing startTiming();
|
|
|
|
Timing startTiming();
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
@@ -43,6 +44,7 @@ public interface Timing extends AutoCloseable {
|
|
|
|
@@ -46,6 +47,7 @@ public interface Timing extends AutoCloseable {
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* 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
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@@ -73,7 +73,7 @@ index a21e5ead5024fd0058c5e3302d8201dd249d32bc..505908e987a032a801ae03d7fb020dfb
|
|
|
|
void stopTiming();
|
|
|
|
void stopTiming();
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
@@ -53,6 +55,7 @@ public interface Timing extends AutoCloseable {
|
|
|
|
@@ -56,6 +58,7 @@ public interface Timing extends AutoCloseable {
|
|
|
|
* @return Timing
|
|
|
|
* @return Timing
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@NotNull
|
|
|
|
@NotNull
|
|
|
|
@@ -81,7 +81,7 @@ index a21e5ead5024fd0058c5e3302d8201dd249d32bc..505908e987a032a801ae03d7fb020dfb
|
|
|
|
Timing startTimingIfSync();
|
|
|
|
Timing startTimingIfSync();
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
@@ -62,12 +65,14 @@ public interface Timing extends AutoCloseable {
|
|
|
|
@@ -65,12 +68,14 @@ public interface Timing extends AutoCloseable {
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* But only if we are on the primary thread.
|
|
|
|
* But only if we are on the primary thread.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@@ -96,7 +96,7 @@ index a21e5ead5024fd0058c5e3302d8201dd249d32bc..505908e987a032a801ae03d7fb020dfb
|
|
|
|
void abort();
|
|
|
|
void abort();
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
@@ -79,5 +84,6 @@ public interface Timing extends AutoCloseable {
|
|
|
|
@@ -82,5 +87,6 @@ public interface Timing extends AutoCloseable {
|
|
|
|
TimingHandler getTimingHandler();
|
|
|
|
TimingHandler getTimingHandler();
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@@ -104,10 +104,10 @@ index a21e5ead5024fd0058c5e3302d8201dd249d32bc..505908e987a032a801ae03d7fb020dfb
|
|
|
|
void close();
|
|
|
|
void close();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
|
|
|
|
diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
|
|
|
|
index dd72a34eaa4bedd9ea0b92eaa79091b00eb4dd09..759e9cbcedb50894821dcb6dcc602af4f0c3453e 100644
|
|
|
|
index 852f5673fb3f9c7d7ad44b01d04b3dcdf7352e50..945e0bc1214ff3210cafc22a193d41de1c24ad03 100644
|
|
|
|
--- a/src/main/java/co/aikar/timings/Timings.java
|
|
|
|
--- a/src/main/java/co/aikar/timings/Timings.java
|
|
|
|
+++ b/src/main/java/co/aikar/timings/Timings.java
|
|
|
|
+++ b/src/main/java/co/aikar/timings/Timings.java
|
|
|
|
@@ -114,7 +114,7 @@ public final class Timings {
|
|
|
|
@@ -118,7 +118,7 @@ public final class Timings {
|
|
|
|
@NotNull
|
|
|
|
@NotNull
|
|
|
|
public static Timing ofStart(@NotNull Plugin plugin, @NotNull String name, @Nullable Timing groupHandler) {
|
|
|
|
public static Timing ofStart(@NotNull Plugin plugin, @NotNull String name, @Nullable Timing groupHandler) {
|
|
|
|
Timing timing = of(plugin, name, groupHandler);
|
|
|
|
Timing timing = of(plugin, name, groupHandler);
|
|
|
|
@@ -117,10 +117,10 @@ index dd72a34eaa4bedd9ea0b92eaa79091b00eb4dd09..759e9cbcedb50894821dcb6dcc602af4
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
|
|
|
|
diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
|
|
|
|
index 3132dc98d26c54c5e46162e53aaed195d7335c8d..b461b5c50f97f11cb9ef68abc520271bb72440fa 100644
|
|
|
|
index 61cfad5cd53980836e1fd6ecf08a760166fff2b9..1abfcee0f6d632f4cd8d74b4994a90c9ea9d254c 100644
|
|
|
|
--- a/src/main/java/co/aikar/timings/TimingsCommand.java
|
|
|
|
--- a/src/main/java/co/aikar/timings/TimingsCommand.java
|
|
|
|
+++ b/src/main/java/co/aikar/timings/TimingsCommand.java
|
|
|
|
+++ b/src/main/java/co/aikar/timings/TimingsCommand.java
|
|
|
|
@@ -44,7 +44,7 @@ public class TimingsCommand extends BukkitCommand {
|
|
|
|
@@ -45,7 +45,7 @@ public class TimingsCommand extends BukkitCommand {
|
|
|
|
public TimingsCommand(@NotNull String name) {
|
|
|
|
public TimingsCommand(@NotNull String name) {
|
|
|
|
super(name);
|
|
|
|
super(name);
|
|
|
|
this.description = "Manages Spigot Timings data to see performance of the server.";
|
|
|
|
this.description = "Manages Spigot Timings data to see performance of the server.";
|
|
|
|
@@ -129,7 +129,7 @@ index 3132dc98d26c54c5e46162e53aaed195d7335c8d..b461b5c50f97f11cb9ef68abc520271b
|
|
|
|
this.setPermission("bukkit.command.timings");
|
|
|
|
this.setPermission("bukkit.command.timings");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -53,6 +53,13 @@ public class TimingsCommand extends BukkitCommand {
|
|
|
|
@@ -54,6 +54,13 @@ public class TimingsCommand extends BukkitCommand {
|
|
|
|
if (!testPermission(sender)) {
|
|
|
|
if (!testPermission(sender)) {
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -143,7 +143,7 @@ index 3132dc98d26c54c5e46162e53aaed195d7335c8d..b461b5c50f97f11cb9ef68abc520271b
|
|
|
|
if (args.length < 1) {
|
|
|
|
if (args.length < 1) {
|
|
|
|
sender.sendMessage(text("Usage: " + this.usageMessage, NamedTextColor.RED));
|
|
|
|
sender.sendMessage(text("Usage: " + this.usageMessage, NamedTextColor.RED));
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
@@ -111,7 +118,7 @@ public class TimingsCommand extends BukkitCommand {
|
|
|
|
@@ -112,7 +119,7 @@ public class TimingsCommand extends BukkitCommand {
|
|
|
|
Preconditions.checkNotNull(args, "Arguments cannot be null");
|
|
|
|
Preconditions.checkNotNull(args, "Arguments cannot be null");
|
|
|
|
Preconditions.checkNotNull(alias, "Alias cannot be null");
|
|
|
|
Preconditions.checkNotNull(alias, "Alias cannot be null");
|
|
|
|
|
|
|
|
|
|
|
|
@@ -4062,7 +4062,7 @@ index 0000000000000000000000000000000000000000..38483d908ed830e97883733bee2370f8
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
|
|
|
|
diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
|
|
|
|
index 123647bb10fc89508437d7a0bd3fd31d58ee7c82..ce209668dd7f11b284bd7f5688191a0b3ae86a09 100644
|
|
|
|
index 12946bd55fcf7c40d39081779a7fa30049ee6165..9c2d605c50cbf9aefa56ec209df9f6cea1392e89 100644
|
|
|
|
--- a/src/main/java/org/spigotmc/CustomTimingsHandler.java
|
|
|
|
--- a/src/main/java/org/spigotmc/CustomTimingsHandler.java
|
|
|
|
+++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
|
|
|
|
+++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
|
|
|
|
@@ -61,7 +61,7 @@ public final class CustomTimingsHandler {
|
|
|
|
@@ -61,7 +61,7 @@ public final class CustomTimingsHandler {
|
|
|
|
|