From 7a60c09a9783f25d297aad063e087354b95aaa21 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Fri, 2 Nov 2018 22:12:00 +0000
Subject: Add --include-line-numbers flag (#6)

---
 .../me/lucko/spark/common/command/modules/MonitoringModule.java     | 4 ++--
 .../java/me/lucko/spark/common/command/modules/SamplerModule.java   | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'spark-common/src/main/java/me/lucko/spark/common')

diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/modules/MonitoringModule.java b/spark-common/src/main/java/me/lucko/spark/common/command/modules/MonitoringModule.java
index 5d4d84c..cf43c18 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/command/modules/MonitoringModule.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/command/modules/MonitoringModule.java
@@ -29,7 +29,7 @@ import me.lucko.spark.monitor.TickMonitor;
 import me.lucko.spark.sampler.TickCounter;
 
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.List;
 import java.util.function.Consumer;
 
@@ -65,7 +65,7 @@ public class MonitoringModule<S> implements CommandModule<S> {
                     }
                 })
                 .tabCompleter((platform, sender, arguments) -> {
-                    List<String> opts = new ArrayList<>(Collections.singletonList("--threshold"));
+                    List<String> opts = new ArrayList<>(Arrays.asList("--threshold", "--without-gc"));
                     opts.removeAll(arguments);
 
                     return TabCompleter.create()
diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/modules/SamplerModule.java b/spark-common/src/main/java/me/lucko/spark/common/command/modules/SamplerModule.java
index 2b814e3..693ffd9 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/command/modules/SamplerModule.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/command/modules/SamplerModule.java
@@ -57,6 +57,7 @@ public class SamplerModule<S> implements CommandModule<S> {
                 .argumentUsage("not-combined", null)
                 .argumentUsage("interval", "interval millis")
                 .argumentUsage("only-ticks-over", "tick length millis")
+                .argumentUsage("include-line-numbers", null)
                 .executor((platform, sender, arguments) -> {
                     int timeoutSeconds = arguments.intFlag("timeout");
                     if (timeoutSeconds != -1 && timeoutSeconds <= 10) {
@@ -73,6 +74,8 @@ public class SamplerModule<S> implements CommandModule<S> {
                         intervalMillis = 4;
                     }
 
+                    boolean includeLineNumbers = arguments.boolFlag("include-line-numbers");
+
                     Set<String> threads = arguments.stringFlag("thread");
                     ThreadDumper threadDumper;
                     if (threads.isEmpty()) {
@@ -118,6 +121,7 @@ public class SamplerModule<S> implements CommandModule<S> {
                             builder.completeAfter(timeoutSeconds, TimeUnit.SECONDS);
                         }
                         builder.samplingInterval(intervalMillis);
+                        builder.includeLineNumbers(includeLineNumbers);
                         if (ticksOver != -1) {
                             builder.ticksOver(ticksOver, tickCounter);
                         }
@@ -160,7 +164,7 @@ public class SamplerModule<S> implements CommandModule<S> {
                 })
                 .tabCompleter((platform, sender, arguments) -> {
                     List<String> opts = new ArrayList<>(Arrays.asList("--timeout", "--interval",
-                            "--not-combined", "--only-ticks-over"));
+                            "--not-combined", "--only-ticks-over", "--include-line-numbers"));
                     opts.removeAll(arguments);
                     opts.add("--thread"); // allowed multiple times
 
-- 
cgit