dominators

Author: pyricau

build.gradle.kts

@@ -21,7 +21,7 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.0")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.6.0")
     implementation(compose.desktop.currentOs)
-    implementation("com.squareup.leakcanary:shark:2.5")
+    implementation("com.squareup.leakcanary:shark-android:2.6")
     implementation("com.squareup.okio:okio:2.9.0")
     implementation("com.apurebase:kgraphql:0.16.0")
 }

gradle.properties

@@ -1 +1,2 @@
 kotlin.code.style=official
+org.gradle.jvmargs=-Xmx4096m

src/main/kotlin/shark/HeapDumpLoadingState.kt

@@ -2,33 +2,19 @@ package shark
 
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import shark.HprofHeapGraph.Companion.openHeapGraph
 import java.io.File
 import java.util.concurrent.ExecutorService
 
 class HeapDumpLoadingState(val file: File, val ioExecutor: ExecutorService) {
-  val loadedGraph: MutableState<CloseableHeapGraph?> = mutableStateOf(null)
+  val loadedGraph: MutableState<LoadedGraph?> = mutableStateOf(null)
 
   fun load() {
     if (loadedGraph.value != null) {
       return
     }
     println("Opening ${file.path}")
     ioExecutor.execute {
-      val fileSourceProvider = FileSourceProvider(file)
-      val wrapper = object : DualSourceProvider by fileSourceProvider{
-        override fun openRandomAccessSource(): RandomAccessSource {
-          val realSource = fileSourceProvider.openRandomAccessSource()
-          return object : RandomAccessSource by realSource {
-            override fun read(sink: okio.Buffer, position: Long, byteCount: Long): Long {
-              println("IO from thread ${Thread.currentThread().name}")
-              return realSource.read(sink, position, byteCount)
-            }
-          }
-        }
-      }
-      loadedGraph.value = wrapper.openHeapGraph()
+      loadedGraph.value = LoadedGraph.load(file)
     }
   }
 }

src/main/kotlin/shark/HeapGraphWindow.kt

@@ -12,15 +12,13 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.key
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import shark.HeapObject.HeapClass
 import shark.Showing.ShowTree
 import shark.Showing.Start
 
@@ -40,17 +38,10 @@ sealed class Showing {
 @Composable
 fun HeapGraphWindow(loadingState: HeapDumpLoadingState, pressedKeys: PressedKeys) {
   MaterialTheme {
-    val graph = loadingState.loadedGraph.value
-    if (graph == null) {
+    val loadedGraph = loadingState.loadedGraph.value
+    if (loadedGraph == null) {
       LoadingScreen(loadingState.file.name)
     } else {
-      // TODO move
-      val classesWithInstanceCounts = mutableMapOf<Long, Int>()
-      classesWithInstanceCounts.putAll(graph.classes.map { it.objectId to 0 })
-      graph.instances.forEach { instance ->
-        classesWithInstanceCounts[instance.instanceClassId] =
-          classesWithInstanceCounts[instance.instanceClassId]!! + 1
-      }
 
       // TODO Backstack doesn't want to have duplicate entries (ie that are equal) but recents
       // allow that to happen. Need to see what's what.
@@ -60,8 +51,7 @@ fun HeapGraphWindow(loadingState: HeapDumpLoadingState, pressedKeys: PressedKeys
 
       Backstack(backstack) { screen ->
         HeapGraphScreen(
-          graph,
-          classesWithInstanceCounts,
+          loadedGraph,
           pressedKeys,
           screen,
           canGoBack = backstack.size > 1,
@@ -83,8 +73,7 @@ fun HeapGraphWindow(loadingState: HeapDumpLoadingState, pressedKeys: PressedKeys
 
 @Composable
 fun HeapGraphScreen(
-  graph: HeapGraph,
-  classesWithInstanceCounts: Map<Long, Int>,
+  graph: LoadedGraph,
   pressedKeys: PressedKeys,
   showing: Showing,
   canGoBack: Boolean,
@@ -101,19 +90,35 @@ fun HeapGraphScreen(
           }
         }
         Text(text = "Home")
-        // TODO Don't use trailing lambda syntax
         WrapTextBox("Tree", onClick = {
           val showTree =
             ShowTree(
               "List of classes",
               graph.classes.map {
-                val instanceCount = classesWithInstanceCounts[it.objectId]!!
-                it.toTreeItem(instanceCount)
+                it.toTreeItem(graph.instanceCount(it))
               }
                 .toList()
             )
           goTo(showTree)
         })
+        WrapTextBox("Leaks", onClick = {
+          goTo(ShowTree(
+            "Leaking objects",
+            graph.leakingObjectIds.map { graph.findObjectById(it).toTreeItem(graph) }.toList()
+          ))
+        })
+        WrapTextBox("All objects", onClick = {
+          goTo(ShowTree(
+            "All objects",
+            graph.objects.map { it.toTreeItem(graph) }.toList()
+          ))
+        })
+        WrapTextBox("Dominators", onClick = {
+          goTo(ShowTree(
+            "Dominators",
+            graph.dominatorsSortedRetained().filter { it != 0L }.map { graph.findObjectById(it).toTreeItem(graph) }
+          ))
+        })
         Text(text = "Recents")
         for (item in recents.drop(1)) {
           TextBox("$item", onClick = {
@@ -140,7 +145,7 @@ fun HeapGraphScreen(
           pressedKeys = pressedKeys,
           rootItems = showing.initialItems,
           expandItem = { heapItem ->
-            heapItem.expand(graph, classesWithInstanceCounts)
+            heapItem.expand(graph)
           },
           onDoubleClick = { selectedItems ->
             val showTree = ShowTree(