add support for untrace

google · Nov 5, 2021 · 934e034 · 934e034
1 parent 66ce529
commit 934e034
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/src/main/java/com/google/idea/perf/tracer/TracerCommand.kt b/src/main/java/com/google/idea/perf/tracer/TracerCommand.kt
@@ -72,7 +72,7 @@ sealed class TraceTarget {
         val methodName: String?,
         val parameterIndexes: List<Int>? = emptyList(),
         // a redundant option to support user config tab
-        val traceOption: TraceOption = COUNT_AND_WALL_TIME
+        var traceOption: TraceOption = COUNT_AND_WALL_TIME
     ): TraceTarget()
 
     val errors: List<String>

diff --git a/src/main/java/com/google/idea/perf/tracer/TracerController.kt b/src/main/java/com/google/idea/perf/tracer/TracerController.kt
@@ -129,7 +129,12 @@ class TracerController(
                     }
                     is TraceTarget.Method -> {
                         runWithProgress { progress ->
-                            TracerUserConfig.addUserTraceRequest(command.target)
+                            if (command.enable) {
+                                TracerUserConfig.addUserTraceRequest(command.target)
+                            } else {
+                                command.target.traceOption = TraceOption.UNTRACE
+                                TracerUserConfig.addUserUntraceRequest(command.target)
+                            }
                             val clazz = command.target.className
                             val method = command.target.methodName ?: "*"
                             val methodPattern = MethodFqName(clazz, method, "*")

diff --git a/src/main/java/com/google/idea/perf/tracer/TracerUserConfig.kt b/src/main/java/com/google/idea/perf/tracer/TracerUserConfig.kt
@@ -53,7 +53,12 @@ object TracerUserConfig {
 
     fun addUserUntraceRequest(entry: TraceTarget.Method) {
         val sortKey = concatClassAndMethod(entry)
-        userTraceRequests.remove(sortKey)
+        val value = userTraceRequests[sortKey]
+        if (value != null && value.traceOption != TraceOption.UNTRACE) {
+            userTraceRequests.remove(sortKey)
+        } else {
+            userTraceRequests[sortKey] = entry
+        }
     }
 
     private fun concatClassAndMethod(entry: TraceTarget.Method): String {

diff --git a/src/main/java/com/google/idea/perf/tracer/ui/TracerUIConfig.kt b/src/main/java/com/google/idea/perf/tracer/ui/TracerUIConfig.kt
@@ -27,7 +27,11 @@ class TracerUIConfig : JBTextArea() {
     companion object {
         private fun methodToString(method: TraceTarget.Method): String {
             val option = if (method.traceOption == TraceOption.COUNT_AND_WALL_TIME) "+" else "-"
-            return "$option ${method.className}#${method.methodName}"
+            if (method.methodName == "*") {
+                return "$option ${method.className}"
+            } else {
+                return "$option ${method.className}::${method.methodName}"
+            }
         }
     }