diff options
24 files changed, 46 insertions, 45 deletions
diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitTickCounter.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitTickCounter.java index cdb42c1..fbab3e7 100644 --- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitTickCounter.java +++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitTickCounter.java @@ -20,7 +20,7 @@ package me.lucko.spark.bukkit; -import me.lucko.spark.profiler.TickCounter; +import me.lucko.spark.sampler.TickCounter; import org.bukkit.plugin.Plugin; import org.bukkit.scheduler.BukkitTask; diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java index 4a4ae7d..a11eaf4 100644 --- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java +++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java @@ -21,8 +21,8 @@ package me.lucko.spark.bukkit; import me.lucko.spark.common.CommandHandler; -import me.lucko.spark.profiler.ThreadDumper; -import me.lucko.spark.profiler.TickCounter; +import me.lucko.spark.sampler.ThreadDumper; +import me.lucko.spark.sampler.TickCounter; import org.bukkit.ChatColor; import org.bukkit.command.Command; diff --git a/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java b/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java index deffa2c..d5a4ec4 100644 --- a/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java +++ b/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java @@ -21,8 +21,8 @@ package me.lucko.spark.bungeecord; import me.lucko.spark.common.CommandHandler; -import me.lucko.spark.profiler.ThreadDumper; -import me.lucko.spark.profiler.TickCounter; +import me.lucko.spark.sampler.ThreadDumper; +import me.lucko.spark.sampler.TickCounter; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.CommandSender; diff --git a/spark-common/src/main/java/me/lucko/spark/common/CommandHandler.java b/spark-common/src/main/java/me/lucko/spark/common/CommandHandler.java index a90f315..701dec1 100644 --- a/spark-common/src/main/java/me/lucko/spark/common/CommandHandler.java +++ b/spark-common/src/main/java/me/lucko/spark/common/CommandHandler.java @@ -26,11 +26,12 @@ import com.google.common.collect.Sets; import me.lucko.spark.common.http.Bytebin; import me.lucko.spark.memory.HeapDump; -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 me.lucko.spark.monitor.TickMonitor; +import me.lucko.spark.sampler.Sampler; +import me.lucko.spark.sampler.SamplerBuilder; +import me.lucko.spark.sampler.ThreadDumper; +import me.lucko.spark.sampler.ThreadGrouper; +import me.lucko.spark.sampler.TickCounter; import java.io.IOException; import java.util.ArrayList; diff --git a/spark-common/src/main/java/me/lucko/spark/common/GarbageCollectionMonitor.java b/spark-common/src/main/java/me/lucko/spark/monitor/GarbageCollectionMonitor.java index dd9931e..906ca07 100644 --- a/spark-common/src/main/java/me/lucko/spark/common/GarbageCollectionMonitor.java +++ b/spark-common/src/main/java/me/lucko/spark/monitor/GarbageCollectionMonitor.java @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package me.lucko.spark.common; +package me.lucko.spark.monitor; import com.sun.management.GarbageCollectionNotificationInfo; diff --git a/spark-common/src/main/java/me/lucko/spark/common/TickMonitor.java b/spark-common/src/main/java/me/lucko/spark/monitor/TickMonitor.java index 6dc84ee..a7dd4a8 100644 --- a/spark-common/src/main/java/me/lucko/spark/common/TickMonitor.java +++ b/spark-common/src/main/java/me/lucko/spark/monitor/TickMonitor.java @@ -18,11 +18,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package me.lucko.spark.common; +package me.lucko.spark.monitor; import com.sun.management.GarbageCollectionNotificationInfo; -import me.lucko.spark.profiler.TickCounter; +import me.lucko.spark.sampler.TickCounter; import java.text.DecimalFormat; import java.util.DoubleSummaryStatistics; diff --git a/spark-common/src/main/java/me/lucko/spark/profiler/Sampler.java b/spark-common/src/main/java/me/lucko/spark/sampler/Sampler.java index 2432d55..1931ca6 100644 --- a/spark-common/src/main/java/me/lucko/spark/profiler/Sampler.java +++ b/spark-common/src/main/java/me/lucko/spark/sampler/Sampler.java @@ -19,15 +19,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package me.lucko.spark.profiler; +package me.lucko.spark.sampler; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.gson.stream.JsonWriter; -import me.lucko.spark.profiler.aggregator.DataAggregator; -import me.lucko.spark.profiler.aggregator.SimpleDataAggregator; -import me.lucko.spark.profiler.aggregator.TickedDataAggregator; -import me.lucko.spark.profiler.node.ThreadNode; +import me.lucko.spark.sampler.aggregator.DataAggregator; +import me.lucko.spark.sampler.aggregator.SimpleDataAggregator; +import me.lucko.spark.sampler.aggregator.TickedDataAggregator; +import me.lucko.spark.sampler.node.ThreadNode; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/spark-common/src/main/java/me/lucko/spark/profiler/SamplerBuilder.java b/spark-common/src/main/java/me/lucko/spark/sampler/SamplerBuilder.java index e542286..2936c65 100644 --- a/spark-common/src/main/java/me/lucko/spark/profiler/SamplerBuilder.java +++ b/spark-common/src/main/java/me/lucko/spark/sampler/SamplerBuilder.java @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package me.lucko.spark.profiler; +package me.lucko.spark.sampler; import java.util.concurrent.TimeUnit; diff --git a/spark-common/src/main/java/me/lucko/spark/profiler/ThreadDumper.java b/spark-common/src/main/java/me/lucko/spark/sampler/ThreadDumper.java index 21197cc..af963c6 100644 --- a/spark-common/src/main/java/me/lucko/spark/profiler/ThreadDumper.java +++ b/spark-common/src/main/java/me/lucko/spark/sampler/ThreadDumper.java @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package me.lucko.spark.profiler; +package me.lucko.spark.sampler; import java.lang.management.ThreadInfo; import java.lang.management.ThreadMXBean; diff --git a/spark-common/src/main/java/me/lucko/spark/profiler/ThreadGrouper.java b/spark-common/src/main/java/me/lucko/spark/sampler/ThreadGrouper.java index 538d76f..0707df6 100644 --- a/spark-common/src/main/java/me/lucko/spark/profiler/ThreadGrouper.java +++ b/spark-common/src/main/java/me/lucko/spark/sampler/ThreadGrouper.java @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package me.lucko.spark.profiler; +package me.lucko.spark.sampler; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/spark-common/src/main/java/me/lucko/spark/profiler/TickCounter.java b/spark-common/src/main/java/me/lucko/spark/sampler/TickCounter.java index 31d7f9a..d6b754b 100644 --- a/spark-common/src/main/java/me/lucko/spark/profiler/TickCounter.java +++ b/spark-common/src/main/java/me/lucko/spark/sampler/TickCounter.java @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package me.lucko.spark.profiler; +package me.lucko.spark.sampler; /** * A hook with the game's "tick loop". diff --git a/spark-common/src/main/java/me/lucko/spark/profiler/aggregator/DataAggregator.java b/spark-common/src/main/java/me/lucko/spark/sampler/aggregator/DataAggregator.java index cd7db6e..0e38eb4 100644 --- a/spark-common/src/main/java/me/lucko/spark/profiler/aggregator/DataAggregator.java +++ b/spark-common/src/main/java/me/lucko/spark/sampler/aggregator/DataAggregator.java @@ -18,9 +18,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package me.lucko.spark.profiler.aggregator; +package me.lucko.spark.sampler.aggregator; -import me.lucko.spark.profiler.node.ThreadNode; +import me.lucko.spark.sampler.node.ThreadNode; import java.util.Map; diff --git a/spark-common/src/main/java/me/lucko/spark/profiler/aggregator/SimpleDataAggregator.java b/spark-common/src/main/java/me/lucko/spark/sampler/aggregator/SimpleDataAggregator.java index ced42b8..6f01dd5 100644 --- a/spark-common/src/main/java/me/lucko/spark/profiler/aggregator/SimpleDataAggregator.java +++ b/spark-common/src/main/java/me/lucko/spark/sampler/aggregator/SimpleDataAggregator.java @@ -18,11 +18,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package me.lucko.spark.profiler.aggregator; +package me.lucko.spark.sampler.aggregator; -import me.lucko.spark.profiler.ThreadGrouper; -import me.lucko.spark.profiler.node.AbstractNode; -import me.lucko.spark.profiler.node.ThreadNode; +import me.lucko.spark.sampler.ThreadGrouper; +import me.lucko.spark.sampler.node.AbstractNode; +import me.lucko.spark.sampler.node.ThreadNode; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/spark-common/src/main/java/me/lucko/spark/profiler/aggregator/TickedDataAggregator.java b/spark-common/src/main/java/me/lucko/spark/sampler/aggregator/TickedDataAggregator.java index 2b9ba07..d78a2a4 100644 --- a/spark-common/src/main/java/me/lucko/spark/profiler/aggregator/TickedDataAggregator.java +++ b/spark-common/src/main/java/me/lucko/spark/sampler/aggregator/TickedDataAggregator.java @@ -18,12 +18,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package me.lucko.spark.profiler.aggregator; +package me.lucko.spark.sampler.aggregator; -import me.lucko.spark.profiler.ThreadGrouper; -import me.lucko.spark.profiler.TickCounter; -import me.lucko.spark.profiler.node.AbstractNode; -import me.lucko.spark.profiler.node.ThreadNode; +import me.lucko.spark.sampler.ThreadGrouper; +import me.lucko.spark.sampler.TickCounter; +import me.lucko.spark.sampler.node.AbstractNode; +import me.lucko.spark.sampler.node.ThreadNode; import java.util.ArrayList; import java.util.List; diff --git a/spark-common/src/main/java/me/lucko/spark/profiler/node/AbstractNode.java b/spark-common/src/main/java/me/lucko/spark/sampler/node/AbstractNode.java index 73c25b6..e660140 100644 --- a/spark-common/src/main/java/me/lucko/spark/profiler/node/AbstractNode.java +++ b/spark-common/src/main/java/me/lucko/spark/sampler/node/AbstractNode.java @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package me.lucko.spark.profiler.node; +package me.lucko.spark.sampler.node; import com.google.gson.stream.JsonWriter; diff --git a/spark-common/src/main/java/me/lucko/spark/profiler/node/StackTraceNode.java b/spark-common/src/main/java/me/lucko/spark/sampler/node/StackTraceNode.java index 24a9f72..d161b42 100644 --- a/spark-common/src/main/java/me/lucko/spark/profiler/node/StackTraceNode.java +++ b/spark-common/src/main/java/me/lucko/spark/sampler/node/StackTraceNode.java @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package me.lucko.spark.profiler.node; +package me.lucko.spark.sampler.node; import com.google.gson.stream.JsonWriter; diff --git a/spark-common/src/main/java/me/lucko/spark/profiler/node/ThreadNode.java b/spark-common/src/main/java/me/lucko/spark/sampler/node/ThreadNode.java index 5239ee3..2acce21 100644 --- a/spark-common/src/main/java/me/lucko/spark/profiler/node/ThreadNode.java +++ b/spark-common/src/main/java/me/lucko/spark/sampler/node/ThreadNode.java @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package me.lucko.spark.profiler.node; +package me.lucko.spark.sampler.node; import com.google.gson.stream.JsonWriter; diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientCommandHandler.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientCommandHandler.java index 913bf21..7706b42 100644 --- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientCommandHandler.java +++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClientCommandHandler.java @@ -20,7 +20,7 @@ package me.lucko.spark.forge; -import me.lucko.spark.profiler.TickCounter; +import me.lucko.spark.sampler.TickCounter; import net.minecraft.client.Minecraft; import net.minecraft.command.ICommandSender; diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeCommandHandler.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeCommandHandler.java index 8f39c1b..baf670d 100644 --- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeCommandHandler.java +++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeCommandHandler.java @@ -23,7 +23,7 @@ package me.lucko.spark.forge; import com.google.common.util.concurrent.ThreadFactoryBuilder; import me.lucko.spark.common.CommandHandler; -import me.lucko.spark.profiler.ThreadDumper; +import me.lucko.spark.sampler.ThreadDumper; import net.kyori.text.TextComponent; import net.kyori.text.serializer.ComponentSerializers; diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerCommandHandler.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerCommandHandler.java index 48eab16..7f119e0 100644 --- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerCommandHandler.java +++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerCommandHandler.java @@ -20,7 +20,7 @@ package me.lucko.spark.forge; -import me.lucko.spark.profiler.TickCounter; +import me.lucko.spark.sampler.TickCounter; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeTickCounter.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeTickCounter.java index ab45182..97903ac 100644 --- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeTickCounter.java +++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeTickCounter.java @@ -20,7 +20,7 @@ package me.lucko.spark.forge; -import me.lucko.spark.profiler.TickCounter; +import me.lucko.spark.sampler.TickCounter; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java b/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java index 1f65803..7dbd3c7 100644 --- a/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java +++ b/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java @@ -23,8 +23,8 @@ package me.lucko.spark.sponge; import com.google.inject.Inject; import me.lucko.spark.common.CommandHandler; -import me.lucko.spark.profiler.ThreadDumper; -import me.lucko.spark.profiler.TickCounter; +import me.lucko.spark.sampler.ThreadDumper; +import me.lucko.spark.sampler.TickCounter; import org.spongepowered.api.Game; import org.spongepowered.api.Sponge; diff --git a/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickCounter.java b/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickCounter.java index b67aff8..a3eba45 100644 --- a/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickCounter.java +++ b/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickCounter.java @@ -20,7 +20,7 @@ package me.lucko.spark.sponge; -import me.lucko.spark.profiler.TickCounter; +import me.lucko.spark.sampler.TickCounter; import org.spongepowered.api.scheduler.Task; diff --git a/spark-velocity/src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java b/spark-velocity/src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java index d32bf02..3d849c6 100644 --- a/spark-velocity/src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java +++ b/spark-velocity/src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java @@ -30,8 +30,8 @@ import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; import me.lucko.spark.common.CommandHandler; -import me.lucko.spark.profiler.ThreadDumper; -import me.lucko.spark.profiler.TickCounter; +import me.lucko.spark.sampler.ThreadDumper; +import me.lucko.spark.sampler.TickCounter; import net.kyori.text.Component; import net.kyori.text.TextComponent; |