-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Inline collaborators and add support for proper hprof handling on fai…
…lures
- Loading branch information
Showing
22 changed files
with
487 additions
and
350 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 0 additions & 35 deletions
35
leakcanary/leakcanary-core/src/main/java/leakcanary/DumpingHeapGraphProvider.kt
This file was deleted.
Oops, something went wrong.
92 changes: 92 additions & 0 deletions
92
.../leakcanary-core/src/main/java/leakcanary/DumpingRepeatingScenarioObjectGrowthDetector.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| package leakcanary | ||
|
|
||
| import java.io.File | ||
| import shark.HeapDiff | ||
| import shark.HeapTraversalInput | ||
| import shark.HeapTraversalOutput | ||
| import shark.HprofHeapGraph.Companion.openHeapGraph | ||
| import shark.InitialState | ||
| import shark.ObjectGrowthDetector | ||
| import shark.RepeatingScenarioObjectGrowthDetector | ||
| import shark.SharkLog | ||
|
|
||
| /** | ||
| * A [RepeatingScenarioObjectGrowthDetector] suitable for junit based automated tests that | ||
| * can dump the heap. | ||
| * | ||
| * @see [RepeatingScenarioObjectGrowthDetector.findRepeatedlyGrowingObjects] | ||
| */ | ||
| class DumpingRepeatingScenarioObjectGrowthDetector( | ||
| private val objectGrowthDetector: ObjectGrowthDetector, | ||
| private val heapDumpFileProvider: HeapDumpFileProvider, | ||
| private val heapDumper: HeapDumper, | ||
| private val heapDumpStorageStrategy: HeapDumpStorageStrategy, | ||
| ) : RepeatingScenarioObjectGrowthDetector { | ||
|
|
||
| override fun findRepeatedlyGrowingObjects( | ||
| maxHeapDumps: Int, | ||
| scenarioLoopsPerDump: Int, | ||
| roundTripScenario: () -> Unit | ||
| ): HeapDiff { | ||
| val heapDiff = try { | ||
| findRepeatedlyGrowingObjectsInner(scenarioLoopsPerDump, maxHeapDumps, roundTripScenario) | ||
| } catch (exception: Throwable) { | ||
| heapDumpStorageStrategy.onHeapDiffResult(Result.failure(exception)) | ||
| throw exception | ||
| } | ||
| heapDumpStorageStrategy.onHeapDiffResult(Result.success(heapDiff)) | ||
| return heapDiff | ||
| } | ||
|
|
||
| private fun findRepeatedlyGrowingObjectsInner( | ||
| scenarioLoopsPerDump: Int, | ||
| maxHeapDumps: Int, | ||
| roundTripScenario: () -> Unit | ||
| ): HeapDiff { | ||
| var lastTraversalOutput: HeapTraversalInput = InitialState(scenarioLoopsPerDump) | ||
| for (i in 1..maxHeapDumps) { | ||
| repeat(scenarioLoopsPerDump) { | ||
| roundTripScenario() | ||
| } | ||
| val heapDumpFile = heapDumpFileProvider.newHeapDumpFile() | ||
| heapDumper.dumpHeap(heapDumpFile) | ||
| check(heapDumpFile.exists()) { | ||
| "Expected file to exist after heap dump: ${heapDumpFile.absolutePath}" | ||
| } | ||
| heapDumpStorageStrategy.onHeapDumped(heapDumpFile) | ||
| lastTraversalOutput = try { | ||
| heapDumpFile.findGrowingObjects(lastTraversalOutput) | ||
| } finally { | ||
| heapDumpStorageStrategy.onHeapDumpClosed(heapDumpFile) | ||
| } | ||
| if (lastTraversalOutput is HeapDiff) { | ||
| if (!lastTraversalOutput.isGrowing) { | ||
| return lastTraversalOutput | ||
| } else if (i < maxHeapDumps) { | ||
| // Log unless it's the last diff, which typically gets printed by calling code. | ||
| SharkLog.d { | ||
| "After ${lastTraversalOutput.traversalCount} heap dumps with $scenarioLoopsPerDump scenario iterations before each, " + | ||
| "${lastTraversalOutput.growingObjects.size} growing nodes:\n" + lastTraversalOutput.growingObjects | ||
| } | ||
| } | ||
| } | ||
| } | ||
| check(lastTraversalOutput is HeapDiff) { | ||
| "Final output should be a HeapGrowth, traversalCount ${lastTraversalOutput.traversalCount - 1} " + | ||
| "should be >= 2. Output: $lastTraversalOutput" | ||
| } | ||
| return lastTraversalOutput | ||
| } | ||
|
|
||
| private fun File.findGrowingObjects( | ||
| previousTraversal: HeapTraversalInput | ||
| ): HeapTraversalOutput { | ||
| return openHeapGraph().use { heapGraph -> | ||
| objectGrowthDetector.findGrowingObjects( | ||
| heapGraph = heapGraph, | ||
| previousTraversal = previousTraversal, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.