azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[debug] coroutine's stack frame locations pre-calculated on initialization

Browse Source
This commit is contained in:
Vladimir Ilmov
2020-01-13 17:40:16 +01:00
committed by Vladimir Ilmov
parent 4191d1d699
commit c8c0f3383d
2 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/CoroutineBuilder.kt
+6 -19
View File
@@ -200,10 +200,8 @@ class CreationCoroutineStackFrameItem(
frame: StackFrameProxyImpl,
val stackTraceElement: StackTraceElement,
stackFrame: XStackFrame,
val location: Location
) : CoroutineStackFrameItem(frame, stackFrame) {
override fun location() = location
location: Location
) : CoroutineStackFrameItem(frame, stackFrame, location) {
fun emptyDescriptor() =
EmptyStackFrameDescriptor(stackTraceElement, frame)
}
@@ -213,9 +211,7 @@ class SuspendCoroutineStackFrameItem(
val stackTraceElement: StackTraceElement,
stackFrame: XStackFrame,
val lastObservedFrameFieldRef: ObjectReference
) : CoroutineStackFrameItem(frame, stackFrame) {
override fun location() = frame.location()
) : CoroutineStackFrameItem(frame, stackFrame, frame.location()) {
fun emptyDescriptor() =
EmptyStackFrameDescriptor(stackTraceElement, frame)
}
@@ -224,28 +220,19 @@ class AsyncCoroutineStackFrameItem(
frame: StackFrameProxyImpl,
val frameItem: StackFrameItem,
stackFrame: XStackFrame
) : CoroutineStackFrameItem(frame, stackFrame) {
override fun location() : Location = frame.location()
}
) : CoroutineStackFrameItem(frame, stackFrame, frame.location())
class RunningCoroutineStackFrameItem(
frame: StackFrameProxyImpl,
stackFrame: XStackFrame
) : CoroutineStackFrameItem(frame, stackFrame) {
val location = frame.location() // it should be invoked in manager thread
) : CoroutineStackFrameItem(frame, stackFrame, frame.location())
override fun location() = location
}
abstract class CoroutineStackFrameItem(val frame: StackFrameProxyImpl, val stackFrame: XStackFrame) {
abstract class CoroutineStackFrameItem(val frame: StackFrameProxyImpl, val stackFrame: XStackFrame, val location: Location) {
val log by logger
fun sourcePosition() : XSourcePosition? = stackFrame.sourcePosition
abstract fun location(): Location
fun uniqueId(): String {
val location = location()
try {
return location.safeSourceName() + ":" + location.safeMethod().toString() + ":" +
location.safeLineNumber() + ":" + location.safeSourceLineNumber()
idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/XCoroutineView.kt
+1 -1
View File
@@ -237,7 +237,7 @@ class XCoroutineView(val project: Project, val session: XDebugSession) :
inner class CoroutineFrameValue(val frame: CoroutineStackFrameItem
) : XNamedValue(frame.uniqueId()) {
override fun computePresentation(node: XValueNode, place: XValuePlace) =
applyRenderer(node, renderer.render(frame.location()))
applyRenderer(node, renderer.render(frame.location))
}
private fun applyRenderer(node: XValueNode, presentation: SimpleColoredTextIcon) =