From 7d6808cbcfbb0f61f93e536d36968eeda5bd302c Mon Sep 17 00:00:00 2001 From: Luck Date: Wed, 6 Jun 2018 15:39:16 +0100 Subject: Convert to Gradle --- .gitignore | 168 +--------- build.gradle | 30 ++ bukkit/pom.xml | 62 ---- .../me/lucko/spark/bukkit/BukkitTickCounter.java | 55 --- .../me/lucko/spark/bukkit/SparkBukkitPlugin.java | 73 ---- bukkit/src/main/resources/plugin.yml | 10 - bungeecord/pom.xml | 55 --- .../spark/bungeecord/SparkBungeeCordPlugin.java | 82 ----- bungeecord/src/main/resources/bungee.yml | 5 - common/pom.xml | 63 ---- .../java/me/lucko/spark/common/CommandHandler.java | 372 --------------------- .../java/me/lucko/spark/common/TickMonitor.java | 88 ----- .../java/me/lucko/spark/common/http/Bytebin.java | 54 --- .../me/lucko/spark/common/http/HttpClient.java | 113 ------- .../lucko/spark/profiler/AsyncDataAggregator.java | 77 ----- .../me/lucko/spark/profiler/DataAggregator.java | 32 -- .../main/java/me/lucko/spark/profiler/Sampler.java | 170 ---------- .../me/lucko/spark/profiler/SamplerBuilder.java | 63 ---- .../java/me/lucko/spark/profiler/StackNode.java | 141 -------- .../me/lucko/spark/profiler/StackTraceNode.java | 71 ---- .../java/me/lucko/spark/profiler/ThreadDumper.java | 77 ----- .../me/lucko/spark/profiler/ThreadGrouper.java | 52 --- .../java/me/lucko/spark/profiler/TickCounter.java | 39 --- .../lucko/spark/profiler/TickedDataAggregator.java | 147 -------- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54413 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 172 ++++++++++ gradlew.bat | 84 +++++ pom.xml | 108 ------ settings.gradle | 2 + spark-bukkit/build.gradle | 11 + .../me/lucko/spark/bukkit/BukkitTickCounter.java | 55 +++ .../me/lucko/spark/bukkit/SparkBukkitPlugin.java | 73 ++++ spark-bukkit/src/main/resources/plugin.yml | 10 + spark-bungeecord/build.gradle | 11 + .../spark/bungeecord/SparkBungeeCordPlugin.java | 82 +++++ spark-bungeecord/src/main/resources/bungee.yml | 5 + spark-common/build.gradle | 6 + .../java/me/lucko/spark/common/CommandHandler.java | 372 +++++++++++++++++++++ .../java/me/lucko/spark/common/TickMonitor.java | 88 +++++ .../java/me/lucko/spark/common/http/Bytebin.java | 54 +++ .../me/lucko/spark/common/http/HttpClient.java | 113 +++++++ .../lucko/spark/profiler/AsyncDataAggregator.java | 77 +++++ .../me/lucko/spark/profiler/DataAggregator.java | 32 ++ .../main/java/me/lucko/spark/profiler/Sampler.java | 170 ++++++++++ .../me/lucko/spark/profiler/SamplerBuilder.java | 63 ++++ .../java/me/lucko/spark/profiler/StackNode.java | 141 ++++++++ .../me/lucko/spark/profiler/StackTraceNode.java | 71 ++++ .../java/me/lucko/spark/profiler/ThreadDumper.java | 77 +++++ .../me/lucko/spark/profiler/ThreadGrouper.java | 52 +++ .../java/me/lucko/spark/profiler/TickCounter.java | 39 +++ .../lucko/spark/profiler/TickedDataAggregator.java | 147 ++++++++ spark-sponge/build.gradle | 14 + .../me/lucko/spark/sponge/SparkSpongePlugin.java | 145 ++++++++ .../me/lucko/spark/sponge/SpongeTickCounter.java | 54 +++ spark-universal/build.gradle | 29 ++ sponge/pom.xml | 75 ----- .../me/lucko/spark/sponge/utils/PomData.java | 8 - .../me/lucko/spark/sponge/SparkSpongePlugin.java | 146 -------- .../me/lucko/spark/sponge/SpongeTickCounter.java | 54 --- universal/pom.xml | 102 ------ 61 files changed, 2289 insertions(+), 2557 deletions(-) create mode 100644 build.gradle delete mode 100644 bukkit/pom.xml delete mode 100644 bukkit/src/main/java/me/lucko/spark/bukkit/BukkitTickCounter.java delete mode 100644 bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java delete mode 100644 bukkit/src/main/resources/plugin.yml delete mode 100644 bungeecord/pom.xml delete mode 100644 bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java delete mode 100644 bungeecord/src/main/resources/bungee.yml delete mode 100644 common/pom.xml delete mode 100644 common/src/main/java/me/lucko/spark/common/CommandHandler.java delete mode 100644 common/src/main/java/me/lucko/spark/common/TickMonitor.java delete mode 100644 common/src/main/java/me/lucko/spark/common/http/Bytebin.java delete mode 100644 common/src/main/java/me/lucko/spark/common/http/HttpClient.java delete mode 100644 common/src/main/java/me/lucko/spark/profiler/AsyncDataAggregator.java delete mode 100644 common/src/main/java/me/lucko/spark/profiler/DataAggregator.java delete mode 100644 common/src/main/java/me/lucko/spark/profiler/Sampler.java delete mode 100644 common/src/main/java/me/lucko/spark/profiler/SamplerBuilder.java delete mode 100644 common/src/main/java/me/lucko/spark/profiler/StackNode.java delete mode 100644 common/src/main/java/me/lucko/spark/profiler/StackTraceNode.java delete mode 100644 common/src/main/java/me/lucko/spark/profiler/ThreadDumper.java delete mode 100644 common/src/main/java/me/lucko/spark/profiler/ThreadGrouper.java delete mode 100644 common/src/main/java/me/lucko/spark/profiler/TickCounter.java delete mode 100644 common/src/main/java/me/lucko/spark/profiler/TickedDataAggregator.java create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat delete mode 100644 pom.xml create mode 100644 settings.gradle create mode 100644 spark-bukkit/build.gradle create mode 100644 spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitTickCounter.java create mode 100644 spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java create mode 100644 spark-bukkit/src/main/resources/plugin.yml create mode 100644 spark-bungeecord/build.gradle create mode 100644 spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java create mode 100644 spark-bungeecord/src/main/resources/bungee.yml create mode 100644 spark-common/build.gradle create mode 100644 spark-common/src/main/java/me/lucko/spark/common/CommandHandler.java create mode 100644 spark-common/src/main/java/me/lucko/spark/common/TickMonitor.java create mode 100644 spark-common/src/main/java/me/lucko/spark/common/http/Bytebin.java create mode 100644 spark-common/src/main/java/me/lucko/spark/common/http/HttpClient.java create mode 100644 spark-common/src/main/java/me/lucko/spark/profiler/AsyncDataAggregator.java create mode 100644 spark-common/src/main/java/me/lucko/spark/profiler/DataAggregator.java create mode 100644 spark-common/src/main/java/me/lucko/spark/profiler/Sampler.java create mode 100644 spark-common/src/main/java/me/lucko/spark/profiler/SamplerBuilder.java create mode 100644 spark-common/src/main/java/me/lucko/spark/profiler/StackNode.java create mode 100644 spark-common/src/main/java/me/lucko/spark/profiler/StackTraceNode.java create mode 100644 spark-common/src/main/java/me/lucko/spark/profiler/ThreadDumper.java create mode 100644 spark-common/src/main/java/me/lucko/spark/profiler/ThreadGrouper.java create mode 100644 spark-common/src/main/java/me/lucko/spark/profiler/TickCounter.java create mode 100644 spark-common/src/main/java/me/lucko/spark/profiler/TickedDataAggregator.java create mode 100644 spark-sponge/build.gradle create mode 100644 spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java create mode 100644 spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickCounter.java create mode 100644 spark-universal/build.gradle delete mode 100644 sponge/pom.xml delete mode 100644 sponge/src/main/java-templates/me/lucko/spark/sponge/utils/PomData.java delete mode 100644 sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java delete mode 100644 sponge/src/main/java/me/lucko/spark/sponge/SpongeTickCounter.java delete mode 100644 universal/pom.xml diff --git a/.gitignore b/.gitignore index ba4c623..70e36dc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,164 +1,6 @@ -# Created by https://www.gitignore.io/ - -### Intellij ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff: -.idea/ -*.iws +/.gradle/ +/.idea/ +/build/ /out/ -*.iml -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - - -### Maven ### -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties -.mvn/timing.properties - - -### Eclipse ### - -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.settings/ -.loadpath -.recommenders - -# Eclipse Core -.project - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# PyDev specific (Python IDE for Eclipse) -*.pydevproject - -# CDT-specific (C/C++ Development Tooling) -.cproject - -# JDT-specific (Eclipse Java Development Tools) -.classpath - -# Java annotation processor (APT) -.factorypath - -# PDT-specific (PHP Development Tools) -.buildpath - -# sbteclipse plugin -.target - -# Tern plugin -.tern-project - -# TeXlipse plugin -.texlipse - -# STS (Spring Tool Suite) -.springBeans - -# Code Recommenders -.recommenders/ - - -### Linux ### -*~ - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# KDE directory preferences -.directory - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* - - -### macOS ### -*.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon -# Thumbnails -._* -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - - -### Windows ### -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -# Windows shortcuts -*.lnk - - -### Java ### -*.class - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.ear - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* +/run/ +/*.iml \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..0128f6e --- /dev/null +++ b/build.gradle @@ -0,0 +1,30 @@ +allprojects { + group = 'me.lucko' + version = '1.0-SNAPSHOT' +} + +subprojects { + apply plugin: 'java' + apply plugin: 'maven' + + ext { + pluginVersion = '1.0.4' + } + + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + + tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' + } + + repositories { + mavenLocal() + mavenCentral() + + maven { url "https://repo.lucko.me/" } + maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" } + maven { url "https://repo.spongepowered.org/maven" } + } + +} diff --git a/bukkit/pom.xml b/bukkit/pom.xml deleted file mode 100644 index 3e24269..0000000 --- a/bukkit/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - spark-parent - me.lucko - 1.0-SNAPSHOT - - 4.0.0 - - spark-bukkit - jar - - - clean package - spark-bukkit - - - src/main/resources - true - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.version} - - 1.8 - 1.8 - - - - - - - - - me.lucko - spark-common - ${project.version} - provided - - - - - org.spigotmc - spigot-api - 1.12.2-R0.1-SNAPSHOT - provided - - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - diff --git a/bukkit/src/main/java/me/lucko/spark/bukkit/BukkitTickCounter.java b/bukkit/src/main/java/me/lucko/spark/bukkit/BukkitTickCounter.java deleted file mode 100644 index 61a7690..0000000 --- a/bukkit/src/main/java/me/lucko/spark/bukkit/BukkitTickCounter.java +++ /dev/null @@ -1,55 +0,0 @@ -package me.lucko.spark.bukkit; - -import me.lucko.spark.profiler.TickCounter; - -import org.bukkit.plugin.Plugin; -import org.bukkit.scheduler.BukkitTask; - -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.atomic.LongAdder; - -public class BukkitTickCounter implements TickCounter, Runnable { - private final Plugin plugin; - private BukkitTask task; - - private final Set tasks = new HashSet<>(); - private final LongAdder tick = new LongAdder(); - - public BukkitTickCounter(Plugin plugin) { - this.plugin = plugin; - } - - @Override - public void run() { - this.tick.increment(); - for (Runnable r : this.tasks){ - r.run(); - } - } - - @Override - public void start() { - this.task = this.plugin.getServer().getScheduler().runTaskTimer(this.plugin, this, 1, 1); - } - - @Override - public void close() { - this.task.cancel(); - } - - @Override - public long getCurrentTick() { - return this.tick.longValue(); - } - - @Override - public void addTickTask(Runnable runnable) { - this.tasks.add(runnable); - } - - @Override - public void removeTickTask(Runnable runnable) { - this.tasks.remove(runnable); - } -} diff --git a/bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java b/bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java deleted file mode 100644 index dc432c5..0000000 --- a/bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java +++ /dev/null @@ -1,73 +0,0 @@ -package me.lucko.spark.bukkit; - -import me.lucko.spark.common.CommandHandler; -import me.lucko.spark.profiler.ThreadDumper; -import me.lucko.spark.profiler.TickCounter; - -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.plugin.java.JavaPlugin; - -public class SparkBukkitPlugin extends JavaPlugin { - - private final CommandHandler commandHandler = new CommandHandler() { - - private String colorize(String message) { - return ChatColor.translateAlternateColorCodes('&', message); - } - - private void broadcast(String msg) { - getServer().getConsoleSender().sendMessage(msg); - for (Player player : getServer().getOnlinePlayers()) { - if (player.hasPermission("spark.profiler")) { - player.sendMessage(msg); - } - } - } - - @Override - protected void sendMessage(CommandSender sender, String message) { - sender.sendMessage(colorize(message)); - } - - @Override - protected void sendMessage(String message) { - String msg = colorize(message); - broadcast(msg); - } - - @Override - protected void sendLink(String url) { - String msg = colorize("&7" + url); - broadcast(msg); - } - - @Override - protected void runAsync(Runnable r) { - getServer().getScheduler().runTaskAsynchronously(SparkBukkitPlugin.this, r); - } - - @Override - protected ThreadDumper getDefaultThreadDumper() { - return new ThreadDumper.Specific(new long[]{Thread.currentThread().getId()}); - } - - @Override - protected TickCounter newTickCounter() { - return new BukkitTickCounter(SparkBukkitPlugin.this); - } - }; - - @Override - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!sender.hasPermission("spark.profiler")) { - sender.sendMessage(ChatColor.RED + "You do not have permission to use this command."); - return true; - } - - this.commandHandler.handleCommand(sender, args); - return true; - } -} diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml deleted file mode 100644 index bd549b5..0000000 --- a/bukkit/src/main/resources/plugin.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: spark -version: 1.0.4 -description: ${project.description} -authors: [Luck, sk89q] -main: me.lucko.spark.bukkit.SparkBukkitPlugin - -commands: - spark: - description: Main plugin command - aliases: [profiler] \ No newline at end of file diff --git a/bungeecord/pom.xml b/bungeecord/pom.xml deleted file mode 100644 index a8c2db9..0000000 --- a/bungeecord/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - spark-parent - me.lucko - 1.0-SNAPSHOT - - 4.0.0 - - spark-bungeecord - jar - - - clean package - spark-bungeecord - - - src/main/resources - true - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.version} - - 1.8 - 1.8 - - - - - - - - - me.lucko - spark-common - ${project.version} - provided - - - - - net.md-5 - bungeecord-api - 1.12-SNAPSHOT - provided - - - - diff --git a/bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java b/bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java deleted file mode 100644 index 59bab67..0000000 --- a/bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java +++ /dev/null @@ -1,82 +0,0 @@ -package me.lucko.spark.bungeecord; - -import me.lucko.spark.common.CommandHandler; -import me.lucko.spark.profiler.ThreadDumper; -import me.lucko.spark.profiler.TickCounter; - -import net.md_5.bungee.api.ChatColor; -import net.md_5.bungee.api.CommandSender; -import net.md_5.bungee.api.chat.BaseComponent; -import net.md_5.bungee.api.chat.ClickEvent; -import net.md_5.bungee.api.chat.TextComponent; -import net.md_5.bungee.api.connection.ProxiedPlayer; -import net.md_5.bungee.api.plugin.Command; -import net.md_5.bungee.api.plugin.Plugin; - -public class SparkBungeeCordPlugin extends Plugin { - - private final CommandHandler commandHandler = new CommandHandler() { - private BaseComponent[] colorize(String message) { - return TextComponent.fromLegacyText(ChatColor.translateAlternateColorCodes('&', message)); - } - - private void broadcast(BaseComponent... msg) { - getProxy().getConsole().sendMessage(msg); - for (ProxiedPlayer player : getProxy().getPlayers()) { - if (player.hasPermission("spark.profiler")) { - player.sendMessage(msg); - } - } - } - - @Override - protected void sendMessage(CommandSender sender, String message) { - sender.sendMessage(colorize(message)); - } - - @Override - protected void sendMessage(String message) { - broadcast(colorize(message)); - } - - @Override - protected void sendLink(String url) { - TextComponent component = new TextComponent(url); - component.setColor(ChatColor.GRAY); - component.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, url)); - broadcast(component); - } - - @Override - protected void runAsync(Runnable r) { - getProxy().getScheduler().runAsync(SparkBungeeCordPlugin.this, r); - } - - @Override - protected ThreadDumper getDefaultThreadDumper() { - return new ThreadDumper.All(); - } - - @Override - protected TickCounter newTickCounter() { - throw new UnsupportedOperationException(); - } - }; - - @Override - public void onEnable() { - getProxy().getPluginManager().registerCommand(this, new Command("sparkbungee", null, "gprofiler") { - @Override - public void execute(CommandSender sender, String[] args) { - if (!sender.hasPermission("spark.profiler")) { - TextComponent msg = new TextComponent("You do not have permission to use this command."); - msg.setColor(ChatColor.RED); - sender.sendMessage(msg); - return; - } - - SparkBungeeCordPlugin.this.commandHandler.handleCommand(sender, args); - } - }); - } -} diff --git a/bungeecord/src/main/resources/bungee.yml b/bungeecord/src/main/resources/bungee.yml deleted file mode 100644 index 429cf0b..0000000 --- a/bungeecord/src/main/resources/bungee.yml +++ /dev/null @@ -1,5 +0,0 @@ -name: spark -version: 1.0.4 -description: ${project.description} -author: Luck, sk89q -main: me.lucko.spark.bungeecord.SparkBungeeCordPlugin diff --git a/common/pom.xml b/common/pom.xml deleted file mode 100644 index 5f48fdf..0000000 --- a/common/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - spark-parent - me.lucko - 1.0-SNAPSHOT - - 4.0.0 - - spark-common - jar - - - clean package - spark-common - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.version} - - 1.8 - 1.8 - - - - - - - - - com.google.code.gson - gson - 2.7 - provided - - - - com.google.guava - guava - 19.0 - provided - - - - - com.squareup.okhttp3 - okhttp - 3.10.0 - compile - - - - com.squareup.okio - okio - 1.14.0 - compile - - - - diff --git a/common/src/main/java/me/lucko/spark/common/CommandHandler.java b/common/src/main/java/me/lucko/spark/common/CommandHandler.java deleted file mode 100644 index 898bba7..0000000 --- a/common/src/main/java/me/lucko/spark/common/CommandHandler.java +++ /dev/null @@ -1,372 +0,0 @@ -package me.lucko.spark.common; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.SetMultimap; -import com.google.common.collect.Sets; - -import me.lucko.spark.common.http.Bytebin; -import me.lucko.spark.profiler.Sampler; -import me.lucko.spark.profiler.SamplerBuilder; -import me.lucko.spark.profiler.ThreadDumper; -import me.lucko.spark.profiler.ThreadGrouper; -import me.lucko.spark.profiler.TickCounter; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.Timer; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - -/** - * Abstract command handling class used by all platforms. - * - * @param the sender (e.g. CommandSender) type used by the platform - */ -public abstract class CommandHandler { - - /** The URL of the viewer frontend */ - private static final String VIEWER_URL = "https://sparkprofiler.github.io/?"; - /** The prefix used in all messages */ - private static final String PREFIX = "&8[&fspark&8] &7"; - - /** - * The {@link Timer} being used by the {@link #activeSampler}. - */ - private final Timer samplingThread = new Timer("spark-sampling-thread", true); - - /** Guards {@link #activeSampler} */ - private final Object[] activeSamplerMutex = new Object[0]; - /** The WarmRoast instance currently running, if any */ - private Sampler activeSampler = null; - /** The tick monitor instance currently running, if any */ - private ReportingTickMonitor activeTickMonitor = null; - - - // abstract methods implemented by each platform - - protected abstract void sendMessage(T sender, String message); - protected abstract void sendMessage(String message); - protected abstract void sendLink(String url); - protected abstract void runAsync(Runnable r); - protected abstract ThreadDumper getDefaultThreadDumper(); - protected abstract TickCounter newTickCounter(); - - private void sendPrefixedMessage(T sender, String message) { - sendMessage(sender, PREFIX + message); - } - - private void sendPrefixedMessage(String message) { - sendMessage(PREFIX + message); - } - - public void handleCommand(T sender, String[] args) { - try { - if (args.length == 0) { - sendInfo(sender); - return; - } - - List arguments = new ArrayList<>(Arrays.asList(args)); - switch (arguments.remove(0).toLowerCase()) { - case "start": - handleStart(sender, arguments); - break; - case "info": - handleInfo(sender); - break; - case "cancel": - handleCancel(sender); - break; - case "stop": - case "upload": - case "paste": - handleStop(sender); - break; - case "monitoring": - handleMonitoring(sender, arguments); - break; - default: - sendInfo(sender); - break; - } - } catch (IllegalArgumentException e) { - sendMessage(sender, "&c" + e.getMessage()); - } - } - - private void sendInfo(T sender) { - sendPrefixedMessage(sender, "&fspark profiler &7v1.0"); - sendMessage(sender, "&b&l> &7/profiler start"); - sendMessage(sender, " &8[&7--timeout&8 ]"); - sendMessage(sender, " &8[&7--thread&8 ]"); - sendMessage(sender, " &8[&7--not-combined]"); - sendMessage(sender, " &8[&7--interval&8 ]"); - sendMessage(sender, " &8[&7--only-ticks-over&8 ]"); - sendMessage(sender, "&b&l> &7/profiler info"); - sendMessage(sender, "&b&l> &7/profiler stop"); - sendMessage(sender, "&b&l> &7/profiler cancel"); - sendMessage(sender, "&b&l> &7/profiler monitoring"); - sendMessage(sender, " &8[&7--threshold&8 ]"); - } - - private void handleStart(T sender, List args) { - SetMultimap arguments = parseArguments(args); - - int timeoutSeconds = parseInt(arguments, "timeout", "d"); - if (timeoutSeconds != -1 && timeoutSeconds <= 10) { - sendPrefixedMessage(sender, "&cThe specified timeout is not long enough for accurate results to be formed. Please choose a value greater than 10."); - return; - } - - if (timeoutSeconds != -1 && timeoutSeconds < 30) { - sendPrefixedMessage(sender, "&7The accuracy of the output will significantly improve when sampling is able to run for longer periods. Consider setting a timeout value over 30 seconds."); - } - - int intervalMillis = parseInt(arguments, "interval", "i"); - if (intervalMillis <= 0) { - intervalMillis = 4; - } - - Set threads = Sets.union(arguments.get("thread"), arguments.get("t")); - ThreadDumper threadDumper; - if (threads.isEmpty()) { - // use the server thread - threadDumper = getDefaultThreadDumper(); - } else if (threads.contains("*")) { - threadDumper = ThreadDumper.ALL; - } else { - threadDumper = new ThreadDumper.Specific(threads); - } - - ThreadGrouper threadGrouper; - if (arguments.containsKey("not-combined")) { - threadGrouper = ThreadGrouper.BY_NAME; - } else { - threadGrouper = ThreadGrouper.BY_POOL; - } - - int ticksOver = parseInt(arguments, "only-ticks-over", "o"); - TickCounter tickCounter = null; - if (ticksOver != -1) { - try { - tickCounter = newTickCounter(); - } catch (UnsupportedOperationException e) { - sendPrefixedMessage(sender, "&cTick counting is not supported on BungeeCord!"); - return; - } - } - - Sampler sampler; - synchronized (this.activeSamplerMutex) { - if (this.activeSampler != null) { - sendPrefixedMessage(sender, "&7An active sampler is already running."); - return; - } - - sendPrefixedMessage("&7Initializing a new profiler, please wait..."); - - SamplerBuilder builder = new SamplerBuilder(); - builder.threadDumper(threadDumper); - builder.threadGrouper(threadGrouper); - if (timeoutSeconds != -1) { - builder.completeAfter(timeoutSeconds, TimeUnit.SECONDS); - } - builder.samplingInterval(intervalMillis); - if (ticksOver != -1) { - builder.ticksOver(ticksOver, tickCounter); - } - sampler = this.activeSampler = builder.start(this.samplingThread); - - sendPrefixedMessage("&bProfiler now active!"); - if (timeoutSeconds == -1) { - sendPrefixedMessage("&7Use '/profiler stop' to stop profiling and upload the results."); - } else { - sendPrefixedMessage("&7The results will be automatically returned after the profiler has been running for " + timeoutSeconds + " seconds."); - } - } - - CompletableFuture future = sampler.getFuture(); - - // send message if profiling fails - future.whenCompleteAsync((s, throwable) -> { - if (throwable != null) { - sendPrefixedMessage("&cSampling operation failed unexpectedly. Error: " + throwable.toString()); - throwable.printStackTrace(); - } - }); - - // set activeSampler to null when complete. - future.whenCompleteAsync((s, throwable) -> { - synchronized (this.activeSamplerMutex) { - if (sampler == this.activeSampler) { - this.activeSampler = null; - } - } - }); - - // await the result - if (timeoutSeconds != -1) { - future.thenAcceptAsync(s -> { - sendPrefixedMessage("&7The active sampling operation has completed! Uploading results..."); - handleUpload(s); - }); - } - } - - private void handleInfo(T sender) { - synchronized (this.activeSamplerMutex) { - if (this.activeSampler == null) { - sendPrefixedMessage(sender, "&7There isn't an active sampling task running."); - } else { - long timeout = this.activeSampler.getEndTime(); - if (timeout == -1) { - sendPrefixedMessage(sender, "&7There is an active sampler currently running, with no defined timeout."); - } else { - long timeoutDiff = (timeout - System.currentTimeMillis()) / 1000L; - sendPrefixedMessage(sender, "&7There is an active sampler currently running, due to timeout in " + timeoutDiff + " seconds."); - } - - long runningTime = (System.currentTimeMillis() - this.activeSampler.getStartTime()) / 1000L; - sendPrefixedMessage(sender, "&7It has been sampling for " + runningTime + " seconds so far."); - } - } - } - - private void handleStop(T sender) { - synchronized (this.activeSamplerMutex) { - if (this.activeSampler == null) { - sendPrefixedMessage(sender, "&7There isn't an active sampling task running."); - } else { - this.activeSampler.cancel(); - sendPrefixedMessage("&7The active sampling operation has been stopped! Uploading results..."); - handleUpload(this.activeSampler); - this.activeSampler = null; - } - } - } - - private void handleCancel(T sender) { - synchronized (this.activeSamplerMutex) { - if (this.activeSampler == null) { - sendPrefixedMessage(sender, "&7There isn't an active sampling task running."); - } else { - this.activeSampler.cancel(); - this.activeSampler = null; - sendPrefixedMessage("&bThe active sampling task has been cancelled."); - } - } - } - - private void handleUpload(Sampler sampler) { - runAsync(() -> { - byte[] output = sampler.formCompressedDataPayload(); - try { - String pasteId = Bytebin.postCompressedContent(output); - sendPrefixedMessage("&bSampling results:"); - sendLink(VIEWER_URL + pasteId); - } catch (IOException e) { - sendPrefixedMessage("&cAn error occurred whilst uploading the results."); - e.printStackTrace(); - } - }); - } - - private void handleMonitoring(T sender, List args) { - SetMultimap arguments = parseArguments(args); - - if (this.activeTickMonitor == null) { - - int threshold = parseInt(arguments, "threshold", "t"); - if (threshold == -1) { - threshold = 100; - } - - try { - TickCounter tickCounter = newTickCounter(); - this.activeTickMonitor = new ReportingTickMonitor(tickCounter, threshold); - } catch (UnsupportedOperationException e) { - sendPrefixedMessage(sender, "&cNot supported on BungeeCord!"); - } - } else { - this.activeTickMonitor.close(); - this.activeTickMonitor = null; - sendPrefixedMessage("&7Tick monitor disabled."); - } - } - - private class ReportingTickMonitor extends TickMonitor { - public ReportingTickMonitor(TickCounter tickCounter, int percentageChangeThreshold) { - super(tickCounter, percentageChangeThreshold); - } - - @Override - protected void sendMessage(String message) { - sendPrefixedMessage(message); - } - } - - private int parseInt(SetMultimap arguments, String longArg, String shortArg) { - Iterator it = Sets.union(arguments.get(longArg), arguments.get(shortArg)).iterator(); - if (it.hasNext()) { - try { - return Math.abs(Integer.parseInt(it.next())); - } catch (NumberFormatException e) { - throw new IllegalArgumentException("Invalid input for '" + longArg + "' argument. Please specify a number!"); - } - } - return -1; // undefined - } - - private static final Pattern FLAG_REGEX = Pattern.compile("--(.+)$|-([a-zA-z])$"); - - private static SetMultimap parseArguments(List args) { - SetMultimap arguments = HashMultimap.create(); - - String flag = null; - List value = null; - - for (int i = 0; i < args.size(); i++) { - String arg = args.get(i); - - Matcher matcher = FLAG_REGEX.matcher(arg); - boolean matches = matcher.matches(); - - if (flag == null || matches) { - if (!matches) { - throw new IllegalArgumentException("Expected flag at position " + i + " but got '" + arg + "' instead!"); - } - - String match = matcher.group(1); - if (match == null) { - match = matcher.group(2); - } - - // store existing value, if present - if (flag != null) { - arguments.put(flag, value.stream().collect(Collectors.joining(" "))); - } - - flag = match.toLowerCase(); - value = new ArrayList<>(); - } else { - // part of a value - value.add(arg); - } - } - - // store remaining value, if present - if (flag != null) { - arguments.put(flag, value.stream().collect(Collectors.joining(" "))); - } - - return arguments; - } - -} diff --git a/common/src/main/java/me/lucko/spark/common/TickMonitor.java b/common/src/main/java/me/lucko/spark/common/TickMonitor.java deleted file mode 100644 index a30a4db..0000000 --- a/common/src/main/java/me/lucko/spark/common/TickMonitor.java +++ /dev/null @@ -1,88 +0,0 @@ -package me.lucko.spark.common; - -import me.lucko.spark.profiler.TickCounter; - -import java.text.DecimalFormat; -import java.util.DoubleSummaryStatistics; - -public abstract class TickMonitor implements Runnable { - private static final DecimalFormat df = new DecimalFormat("#.##"); - - private final TickCounter tickCounter; - private final int percentageChangeThreshold; - - // data - private double lastTickTime = 0; - private State state = null; - private DoubleSummaryStatistics averageTickTime = new DoubleSummaryStatistics(); - private double avg; - - public TickMonitor(TickCounter tickCounter, int percentageChangeThreshold) { - this.tickCounter = tickCounter; - this.percentageChangeThreshold = percentageChangeThreshold; - - this.tickCounter.start(); - this.tickCounter.addTickTask(this); - } - - protected abstract void sendMessage(String message); - - public void close() { - this.tickCounter.close(); - } - - @Override - public void run() { - double now = ((double) System.nanoTime()) / 1000000d; - - // init - if (this.state == null) { - this.state = State.SETUP; - this.lastTickTime = now; - sendMessage("Tick monitor started. Before the monitor becomes fully active, the server's " + - "average tick rate will be calculated over a period of 120 ticks (approx 6 seconds)."); - return; - } - - // find the diff - double diff = now - this.lastTickTime; - this.lastTickTime = now; - - // form averages - if (this.state == State.SETUP) { - this.averageTickTime.accept(diff); - - // move onto the next state - if (this.averageTickTime.getCount() >= 120) { - - sendMessage("&bAnalysis is now complete."); - sendMessage("&f> &7Max: " + df.format(this.averageTickTime.getMax()) + "ms"); - sendMessage("&f> &7Min: " + df.format(this.averageTickTime.getMin()) + "ms"); - sendMessage("&f> &7Avg: " + df.format(this.averageTickTime.getAverage()) + "ms"); - sendMessage("Starting now, any ticks with >" + this.percentageChangeThreshold + "% increase in " + - "duration compared to the average will be reported."); - - this.avg = this.averageTickTime.getAverage(); - this.state = State.MONITORING; - } - } - - if (this.state == State.MONITORING) { - double increase = diff - this.avg; - if (increase <= 0) { - return; - } - - double percentageChange = (increase * 100d) / this.avg; - if (percentageChange > this.percentageChangeThreshold) { - sendMessage("&7Tick &8#" + this.tickCounter.getCurrentTick() + " &7lasted &b" + df.format(diff) + "&7 milliseconds. " + - "&7(&b" + df.format(percentageChange) + "% &7increase from average)"); - } - } - } - - private enum State { - SETUP, - MONITORING - } -} diff --git a/common/src/main/java/me/lucko/spark/common/http/Bytebin.java b/common/src/main/java/me/lucko/spark/common/http/Bytebin.java deleted file mode 100644 index 3cd5e4c..0000000 --- a/common/src/main/java/me/lucko/spark/common/http/Bytebin.java +++ /dev/null @@ -1,54 +0,0 @@ -package me.lucko.spark.common.http; - -import com.google.gson.Gson; -import com.google.gson.JsonObject; - -import okhttp3.MediaType; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; -import okhttp3.ResponseBody; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; - -/** - * Utility for uploading JSON data to bytebin. - */ -public final class Bytebin { - - /** Media type for JSON data */ - private static final MediaType JSON_TYPE = MediaType.parse("application/json; charset=utf-8"); - /** The URL used to upload sampling data */ - private static final String UPLOAD_ENDPOINT = "https://bytebin.lucko.me/post"; - - public static String postCompressedContent(byte[] buf) throws IOException { - RequestBody body = RequestBody.create(JSON_TYPE, buf); - - Request.Builder requestBuilder = new Request.Builder() - .url(UPLOAD_ENDPOINT) - .header("Content-Encoding", "gzip") - .post(body); - - Request request = requestBuilder.build(); - try (Response response = HttpClient.makeCall(request)) { - try (ResponseBody responseBody = response.body()) { - if (responseBody == null) { - throw new RuntimeException("No response"); - } - - try (InputStream inputStream = responseBody.byteStream()) { - try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) { - JsonObject object = new Gson().fromJson(reader, JsonObject.class); - return object.get("key").getAsString(); - } - } - } - } - } - - private Bytebin() {} -} diff --git a/common/src/main/java/me/lucko/spark/common/http/HttpClient.java b/common/src/main/java/me/lucko/spark/common/http/HttpClient.java deleted file mode 100644 index 61db597..0000000 --- a/common/src/main/java/me/lucko/spark/common/http/HttpClient.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * This file is part of LuckPerms, licensed under the MIT License. - * - * Copyright (c) lucko (Luck) - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package me.lucko.spark.common.http; - -import okhttp3.Interceptor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import okhttp3.ResponseBody; - -import java.io.IOException; -import java.net.Proxy; -import java.net.ProxySelector; -import java.net.SocketAddress; -import java.net.URI; -import java.util.Collections; -import java.util.List; - -/** - * Utility class for making http requests. - */ -public final class HttpClient { - private static OkHttpClient client = null; - - private static synchronized OkHttpClient getClient() { - if (client == null) { - client = new OkHttpClient.Builder() - .proxySelector(new NullSafeProxySelector()) - .addInterceptor(new UserAgentInterceptor()) - .build(); - } - return client; - } - - public static Response makeCall(Request request) throws IOException { - Response response = getClient().newCall(request).execute(); - if (!response.isSuccessful()) { - throw exceptionForUnsuccessfulResponse(response); - } - return response; - } - - private static RuntimeException exceptionForUnsuccessfulResponse(Response response) { - String msg = ""; - try (ResponseBody responseBody = response.body()) { - if (responseBody != null) { - msg = responseBody.string(); - } - } catch (IOException e) { - // ignore - } - return new RuntimeException("Got response: " + response.code() + " - " + response.message() + " - " + msg); - } - - private static final class UserAgentInterceptor implements Interceptor { - @Override - public Response intercept(Chain chain) throws IOException { - Request orig = chain.request(); - Request modified = orig.newBuilder() - .header("User-Agent", "spark-plugin") - .build(); - - return chain.proceed(modified); - } - } - - // sometimes ProxySelector#getDefault returns null, and okhttp doesn't like that - private static final class NullSafeProxySelector extends ProxySelector { - private static final List DIRECT = Collections.singletonList(Proxy.NO_PROXY); - - @Override - public List select(URI uri) { - ProxySelector def = ProxySelector.getDefault(); - if (def == null) { - return DIRECT; - } - return def.select(uri); - } - - @Override - public void connectFailed(URI uri, SocketAddress sa, IOException ioe) { - ProxySelector def = ProxySelector.getDefault(); - if (def != null) { - def.connectFailed(uri, sa, ioe); - } - } - } - - private HttpClient() {} -} \ No newline at end of file diff --git a/common/src/main/java/me/lucko/spark/profiler/AsyncDataAggregator.java b/common/src/main/java/me/lucko/spark/profiler/AsyncDataAggregator.java deleted file mode 100644 index 9a4090e..0000000 --- a/common/src/main/java/me/lucko/spark/profiler/AsyncDataAggregator.java +++ /dev/null @@ -1,77 +0,0 @@ -package me.lucko.spark.profiler; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.TimeUnit; - -/** - * Implementation of {@link DataAggregator} that makes use of a "worker" thread pool for inserting - * data. - */ -public class AsyncDataAggregator implements DataAggregator { - - /** A map of root stack nodes for each thread with sampling data */ - private final Map threadData = new ConcurrentHashMap<>(); - - /** The worker pool for inserting stack nodes */ - private final ExecutorService workerPool; - - /** The instance used to group threads together */ - private final ThreadGrouper threadGrouper; - - /** The interval to wait between sampling, in milliseconds */ - private final int interval; - - public AsyncDataAggregator(ExecutorService workerPool, ThreadGrouper threadGrouper, int interval) { - this.workerPool = workerPool; - this.threadGrouper = threadGrouper; - this.interval = interval; - } - - @Override - public void insertData(String threadName, StackTraceElement[] stack) { - // form the queued data - QueuedThreadInfo queuedData = new QueuedThreadInfo(threadName, stack); - // schedule insertion of the data - this.workerPool.execute(queuedData); - } - - @Override - public Map getData() { - // wait for all pending data to be inserted - this.workerPool.shutdown(); - try { - this.workerPool.awaitTermination(15, TimeUnit.SECONDS); - } catch (InterruptedException e) { - e.printStackTrace(); - } - - return this.threadData; - } - - void insertData(QueuedThreadInfo data) { - try { - String group = this.threadGrouper.getGroup(data.threadName); - StackNode node = this.threadData.computeIfAbsent(group, StackNode::new); - node.log(data.stack, this.interval); - } catch (Exception e) { - e.printStackTrace(); - } - } - - private final class QueuedThreadInfo implements Runnable { - private final String threadName; - private final StackTraceElement[] stack; - - QueuedThreadInfo(String threadName, StackTraceElement[] stack) { - this.threadName = threadName; - this.stack = stack; - } - - @Override - public void run() { - insertData(this); - } - } -} diff --git a/common/src/main/java/me/lucko/spark/profiler/DataAggregator.java b/common/src/main/java/me/lucko/spark/profiler/DataAggregator.java deleted file mode 100644 index 1afa52c..0000000 --- a/common/src/main/java/me/lucko/spark/profiler/DataAggregator.java +++ /dev/null @@ -1,32 +0,0 @@ -package me.lucko.spark.profiler; - -import java.util.Map; - -/** - * Aggregates sampling data. - */ -public interface DataAggregator { - - /** - * Called before the sampler begins to insert data - */ - default void start() { - - } - - /** - * Forms the output data - * - * @return the output data - */ - Map getData(); - - /** - * Inserts sampling data into this aggregator - * - * @param threadName the name of the thread - * @param stack the call stack - */ - void insertData(String threadName, StackTraceElement[] stack); - -} diff --git a/common/src/main/java/me/lucko/spark/profiler/Sampler.java b/common/src/main/java/me/lucko/spark/profiler/Sampler.java deleted file mode 100644 index 3476f03..0000000 --- a/common/src/main/java/me/lucko/spark/profiler/Sampler.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * WarmRoast - * Copyright (C) 2013 Albert Pham - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . -*/ - -package me.lucko.spark.profiler; - -import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.google.gson.stream.JsonWriter; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.lang.management.ManagementFactory; -import java.lang.management.ThreadInfo; -import java.lang.management.ThreadMXBean; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Timer; -import java.util.TimerTask; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.zip.GZIPOutputStream; - -/** - * Main sampler class. - */ -public class Sampler extends TimerTask { - private static final AtomicInteger THREAD_ID = new AtomicInteger(0); - - /** The worker pool for inserting stack nodes */ - private final ExecutorService workerPool = Executors.newFixedThreadPool( - 6, new ThreadFactoryBuilder().setNameFormat("spark-worker-" + THREAD_ID.getAndIncrement()).build() - ); - - /** The thread management interface for the current JVM */ - private final ThreadMXBean threadBean = ManagementFactory.getThreadMXBean(); - /** The instance used to generate thread information for use in sampling */ - private final ThreadDumper threadDumper; - /** Responsible for aggregating and then outputting collected sampling data */ - private final DataAggregator dataAggregator; - - /** A future to encapsulation the completion of this sampler instance */ - private final CompletableFuture future = new CompletableFuture<>(); - - /** The interval to wait between sampling, in milliseconds */ - private final int interval; - /** The time when sampling first began */ - private long startTime = -1; - /** The unix timestamp (in millis) when this sampler should automatically complete.*/ - private final long endTime; // -1 for nothing - - public Sampler(int interval, ThreadDumper threadDumper, ThreadGrouper threadGrouper, long endTime) { - this.threadDumper = threadDumper; - this.dataAggregator = new AsyncDataAggregator(this.workerPool, threadGrouper, interval); - this.interval = interval; - this.endTime = endTime; - } - - public Sampler(int interval, ThreadDumper threadDumper, ThreadGrouper threadGrouper, long endTime, TickCounter tickCounter, int tickLengthThreshold) { - this.threadDumper = threadDumper; - this.dataAggregator = new TickedDataAggregator(this.workerPool, tickCounter, threadGrouper, interval, tickLengthThreshold); - this.interval = interval; - this.endTime = endTime; - } - - /** - * Starts the sampler. - * - * @param samplingThread the timer to schedule the sampling on - */ - public void start(Timer samplingThread) { - this.startTime = System.currentTimeMillis(); - this.dataAggregator.start(); - samplingThread.scheduleAtFixedRate(this, 0, this.interval); - } - - public long getStartTime() { - if (this.startTime == -1) { - throw new IllegalStateException("Not yet started"); - } - return this.startTime; - } - - public long getEndTime() { - return this.endTime; - } - - public CompletableFuture getFuture() { - return this.future; - } - - @Override - public void run() { - try { - if (this.endTime != -1 && this.endTime <= System.currentTimeMillis()) { - this.future.complete(this); - cancel(); - return; - } - - ThreadInfo[] threadDumps = this.threadDumper.dumpThreads(this.threadBean); - for (ThreadInfo threadInfo : threadDumps) { - String threadName = threadInfo.getThreadName(); - StackTraceElement[] stack = threadInfo.getStackTrace(); - - if (threadName == null || stack == null) { - continue; - } - - this.dataAggregator.insertData(threadName, stack); - } - } catch (Throwable t) { - this.future.completeExceptionally(t); - cancel(); - } - } - - private void writeOutput(JsonWriter writer) throws IOException { - writer.beginObject(); - - writer.name("threads").beginArray(); - - List> data = new ArrayList<>(this.dataAggregator.getData().entrySet()); - data.sort(Map.Entry.comparingByKey()); - - for (Map.Entry entry : data) { - writer.beginObject(); - writer.name("threadName").value(entry.getKey()); - writer.name("totalTime").value(entry.getValue().getTotalTime()); - writer.name("rootNode"); - entry.getValue().serializeTo(writer); - writer.endObject(); - } - - writer.endArray(); - writer.endObject(); - } - - public byte[] formCompressedDataPayload() { - ByteArrayOutputStream byteOut = new ByteArrayOutputStream(); - try (Writer writer = new OutputStreamWriter(new GZIPOutputStream(byteOut), StandardCharsets.UTF_8)) { - try (JsonWriter jsonWriter = new JsonWriter(writer)) { - writeOutput(jsonWriter); - } - } catch (IOException e) { - throw new RuntimeException(e); - } - return byteOut.toByteArray(); - } - -} diff --git a/common/src/main/java/me/lucko/spark/profiler/SamplerBuilder.java b/common/src/main/java/me/lucko/spark/profiler/SamplerBuilder.java deleted file mode 100644 index 7db0515..0000000 --- a/common/src/main/java/me/lucko/spark/profiler/SamplerBuilder.java +++ /dev/null @@ -1,63 +0,0 @@ -package me.lucko.spark.profiler; - -import java.util.Timer; -import java.util.concurrent.TimeUnit; - -/** - * Builds {@link Sampler} instances. - */ -public class SamplerBuilder { - - private int samplingInterval = 4; - private long timeout = -1; - private ThreadDumper threadDumper = ThreadDumper.ALL; - private ThreadGrouper threadGrouper = ThreadGrouper.BY_NAME; - - private int ticksOver = -1; - private TickCounter tickCounter = null; - - public SamplerBuilder() { - } - - public SamplerBuilder samplingInterval(int samplingInterval) { - this.samplingInterval = samplingInterval; - return this; - } - - public SamplerBuilder completeAfter(long timeout, TimeUnit unit) { - if (timeout <= 0) { - throw new IllegalArgumentException("timeout > 0"); - } - this.timeout = System.currentTimeMillis() + unit.toMillis(timeout); - return this; - } - - public SamplerBuilder threadDumper(ThreadDumper threadDumper) { - this.threadDumper = threadDumper; - return this; - } - - public SamplerBuilder threadGrouper(ThreadGrouper threadGrouper) { - this.threadGrouper = threadGrouper; - return this; - } - - public SamplerBuilder ticksOver(int ticksOver, TickCounter tickCounter) { - this.ticksOver = ticksOver; - this.tickCounter = tickCounter; - return this; - } - - public Sampler start(Timer samplingThread) { - Sampler sampler; - if (this.ticksOver != -1 && this.tickCounter != null) { - sampler = new Sampler(this.samplingInterval, this.threadDumper, this.threadGrouper, this.timeout, this.tickCounter, this.ticksOver); - } else { - sampler = new Sampler(this.samplingInterval, this.threadDumper, this.threadGrouper, this.timeout); - } - - sampler.start(samplingThread); - return sampler; - } - -} diff --git a/common/src/main/java/me/lucko/spark/profiler/StackNode.java b/common/src/main/java/me/lucko/spark/profiler/StackNode.java deleted file mode 100644 index 575400a..0000000 --- a/common/src/main/java/me/lucko/spark/profiler/StackNode.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * WarmRoast - * Copyright (C) 2013 Albert Pham - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied war