From 6958c358446aa0405e819d06e03670d8243ba1a2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 10:39:40 +1000 Subject: [PATCH] Clean up the first two API patches --- ...M-Changes.patch => 0001-POM-Changes.patch} | 8 ++--- ...ch => 0002-Measure-Timings-Duration.patch} | 32 +++++++------------ .../0003-Improved-Timings-System.patch | 19 +++++------ 3 files changed, 24 insertions(+), 35 deletions(-) rename Bukkit-Patches/{0001-Spigot-POM-Changes.patch => 0001-POM-Changes.patch} (93%) rename Bukkit-Patches/{0002-Measure-the-duration-of-the-entire-timings-run.patch => 0002-Measure-Timings-Duration.patch} (64%) diff --git a/Bukkit-Patches/0001-Spigot-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch similarity index 93% rename from Bukkit-Patches/0001-Spigot-POM-Changes.patch rename to Bukkit-Patches/0001-POM-Changes.patch index 5a21a72e75..6b352b5267 100644 --- a/Bukkit-Patches/0001-Spigot-POM-Changes.patch +++ b/Bukkit-Patches/0001-POM-Changes.patch @@ -1,7 +1,7 @@ -From d54411e01b4bc4b5e56f7d60fe24fe2b849f3ca0 Mon Sep 17 00:00:00 2001 +From 9a7ac64686a920a65144ac08945095a4ca69f22b Mon Sep 17 00:00:00 2001 From: md_5 -Date: Wed, 30 Jan 2013 23:44:29 -0500 -Subject: [PATCH] Spigot POM Changes. +Date: Sun, 2 Jun 2013 10:36:24 +1000 +Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml @@ -65,5 +65,5 @@ index 9806ef8..d21978a 100644 -- -1.8.2.1 +1.8.1.2 diff --git a/Bukkit-Patches/0002-Measure-the-duration-of-the-entire-timings-run.patch b/Bukkit-Patches/0002-Measure-Timings-Duration.patch similarity index 64% rename from Bukkit-Patches/0002-Measure-the-duration-of-the-entire-timings-run.patch rename to Bukkit-Patches/0002-Measure-Timings-Duration.patch index 812e05212c..42de2aed62 100644 --- a/Bukkit-Patches/0002-Measure-the-duration-of-the-entire-timings-run.patch +++ b/Bukkit-Patches/0002-Measure-Timings-Duration.patch @@ -1,21 +1,21 @@ -From 960006c6915427e176d8c0cd84f802fbf393d665 Mon Sep 17 00:00:00 2001 +From 077e531e638f0696734b877f623657b0cddcf0c1 Mon Sep 17 00:00:00 2001 From: Aikar -Date: Wed, 9 Jan 2013 16:53:45 -0500 -Subject: [PATCH] Measure the duration of the entire timings run. +Date: Sun, 2 Jun 2013 10:42:57 +1000 +Subject: [PATCH] Measure Timings Duration diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java -index 29ebbe0..94cd62c 100644 +index 29ebbe0..3c4ef89 100644 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java -@@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableList; +@@ -21,6 +21,7 @@ import com.google.common.collect.ImmutableList; + public class TimingsCommand extends BukkitCommand { private static final List TIMINGS_SUBCOMMANDS = ImmutableList.of("merged", "reset", "separate"); ++ public static long timingStart = 0; // Spigot -+ public static long timingStart = 0; // Spigot public TimingsCommand(String name) { super(name); - this.description = "Records timings for all plugin events"; @@ -50,9 +51,11 @@ public class TimingsCommand extends BukkitCommand { } } @@ -32,30 +32,22 @@ index 29ebbe0..94cd62c 100644 } fileTimings.println(" Total time " + totalTime + " (" + totalTime / 1000000000 + "s)"); } -+ fileTimings.println("Sample time " + sampleTime + " (" + sampleTime / 1000000000 + "s)"); // Spigot ++ fileTimings.println( "Sample time " + sampleTime + " (" + sampleTime / 1E9 + "s)" ); // Spigot sender.sendMessage("Timings written to " + timings.getPath()); if (separate) sender.sendMessage("Names written to " + names.getPath()); } catch (IOException e) { diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 93fb4f5..f5f6941 100644 +index 93fb4f5..a96a33b 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -@@ -23,6 +23,7 @@ import org.bukkit.Server; - import org.bukkit.command.Command; - import org.bukkit.command.PluginCommandYamlParser; - import org.bukkit.command.SimpleCommandMap; -+import org.bukkit.command.defaults.TimingsCommand; - import org.bukkit.event.Event; - import org.bukkit.event.EventPriority; - import org.bukkit.event.HandlerList; -@@ -274,6 +275,7 @@ public final class SimplePluginManager implements PluginManager { +@@ -274,6 +274,7 @@ public final class SimplePluginManager implements PluginManager { } } -+ TimingsCommand.timingStart = System.nanoTime(); // Spigot ++ org.bukkit.command.defaults.TimingsCommand.timingStart = System.nanoTime(); // Spigot return result.toArray(new Plugin[result.size()]); } -- -1.8.2.1 +1.8.1.2 diff --git a/Bukkit-Patches/0003-Improved-Timings-System.patch b/Bukkit-Patches/0003-Improved-Timings-System.patch index e7ac3a9cfd..d527e11a3c 100644 --- a/Bukkit-Patches/0003-Improved-Timings-System.patch +++ b/Bukkit-Patches/0003-Improved-Timings-System.patch @@ -1,4 +1,4 @@ -From 33ffd896356f9cff9cde44e093bade06e801e39c Mon Sep 17 00:00:00 2001 +From 43008572d75af40a56e3e6867325d4231f9a08da Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 9 Jan 2013 22:18:26 -0500 Subject: [PATCH] Improved Timings System @@ -169,10 +169,10 @@ index fb3c90f..89c8414 100644 Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Reload complete."); diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java -index 94cd62c..426f9b4 100644 +index 3c4ef89..7386322 100644 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java -@@ -10,40 +10,59 @@ import org.apache.commons.lang.Validate; +@@ -10,14 +10,22 @@ import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; @@ -194,10 +194,8 @@ index 94cd62c..426f9b4 100644 +import java.util.logging.Level; public class TimingsCommand extends BukkitCommand { -- private static final List TIMINGS_SUBCOMMANDS = ImmutableList.of("merged", "reset", "separate"); -+ private static final List TIMINGS_SUBCOMMANDS = ImmutableList.of("merged", "reset", "separate", "paste", "on", "off"); // Spigot - - public static long timingStart = 0; // Spigot + private static final List TIMINGS_SUBCOMMANDS = ImmutableList.of("merged", "reset", "separate"); +@@ -26,24 +34,35 @@ public class TimingsCommand extends BukkitCommand { public TimingsCommand(String name) { super(name); this.description = "Records timings for all plugin events"; @@ -276,12 +274,11 @@ index 94cd62c..426f9b4 100644 } fileTimings.println(" Total time " + totalTime + " (" + totalTime / 1000000000 + "s)"); } -- fileTimings.println("Sample time " + sampleTime + " (" + sampleTime / 1000000000 + "s)"); // Spigot -- sender.sendMessage("Timings written to " + timings.getPath()); + + // Spigot start + CustomTimingsHandler.printTimings(fileTimings); -+ fileTimings.println("Sample time " + sampleTime + " (" + sampleTime / 1000000000 + "s)"); + fileTimings.println( "Sample time " + sampleTime + " (" + sampleTime / 1E9 + "s)" ); // Spigot +- sender.sendMessage("Timings written to " + timings.getPath()); + if (paste) { + new PasteThread(sender, bout).start(); + } else { @@ -399,5 +396,5 @@ index ea30d83..d905435 100644 } else { eventSet.add(new RegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); -- -1.8.2.1 +1.8.1.2