Listen to thread start/stop events from the vm

Author: fwcd

adapter/src/main/kotlin/org/javacs/ktda/core/event/DebuggeeEventBus.kt

@@ -6,5 +6,6 @@ interface DebuggeeEventBus {
 	val exitListeners: ListenerList<ExitEvent>
 	val breakpointListeners: ListenerList<BreakpointStopEvent>
 	val stepListeners: ListenerList<StepStopEvent>
-	var exceptionListeners: ListenerList<ExceptionStopEvent>
+	val exceptionListeners: ListenerList<ExceptionStopEvent>
+	val threadListeners: ListenerList<ThreadEvent>
 }

adapter/src/main/kotlin/org/javacs/ktda/core/event/ThreadEvent.kt

@@ -0,0 +1,3 @@
+package org.javacs.ktda.core.event
+
+object ThreadEvent

adapter/src/main/kotlin/org/javacs/ktda/jdi/JDIDebuggee.kt

@@ -7,6 +7,7 @@ import org.javacs.ktda.core.Position
 import org.javacs.ktda.core.Source
 import org.javacs.ktda.core.launch.LaunchConfiguration
 import org.javacs.ktda.core.event.DebuggeeEventBus
+import org.javacs.ktda.core.event.ThreadEvent
 import org.javacs.ktda.core.breakpoint.Breakpoint
 import org.javacs.ktda.core.breakpoint.ExceptionBreakpoint
 import org.javacs.kt.LOG
@@ -49,7 +50,7 @@ class JDIDebuggee(
 
 		LOG.trace("Updating threads")
 		updateThreads()
-		
+
 		LOG.trace("Updating breakpoints")
 		hookBreakpoints()
 	}

adapter/src/main/kotlin/org/javacs/ktda/jdi/event/VMEventBus.kt

@@ -9,15 +9,19 @@ import org.javacs.ktda.core.event.ExitEvent
 import org.javacs.ktda.core.event.BreakpointStopEvent
 import org.javacs.ktda.core.event.ExceptionStopEvent
 import org.javacs.ktda.core.event.StepStopEvent
+import org.javacs.ktda.core.event.ThreadEvent
 import org.javacs.ktda.jdi.exception.JDIException
 import com.sun.jdi.VirtualMachine
 import com.sun.jdi.VMDisconnectedException
 import com.sun.jdi.event.VMDeathEvent
 import com.sun.jdi.event.Event as JDIEvent
 import com.sun.jdi.event.LocatableEvent as JDILocatableEvent
 import com.sun.jdi.event.EventSet as JDIEventSet
+import com.sun.jdi.event.BreakpointEvent as JDIBreakpointEvent
 import com.sun.jdi.event.StepEvent as JDIStepEvent
 import com.sun.jdi.event.ExceptionEvent as JDIExceptionEvent
+import com.sun.jdi.event.ThreadStartEvent as JDIThreadStartEvent
+import com.sun.jdi.event.ThreadDeathEvent as JDIThreadDeathEvent
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.reflect.KClass
 
@@ -31,7 +35,8 @@ class VMEventBus(private val vm: VirtualMachine): DebuggeeEventBus {
 	override val exitListeners = ListenerList<ExitEvent>()
 	override val breakpointListeners = ListenerList<BreakpointStopEvent>()
 	override val stepListeners = ListenerList<StepStopEvent>()
-	override var exceptionListeners = ListenerList<ExceptionStopEvent>()
+	override val exceptionListeners = ListenerList<ExceptionStopEvent>()
+	override val threadListeners = ListenerList<ThreadEvent>()
 
 	init {
 		startAsyncPoller()
@@ -71,7 +76,7 @@ class VMEventBus(private val vm: VirtualMachine): DebuggeeEventBus {
 	}
 
 	private fun hookListeners() {
-		subscribe(com.sun.jdi.event.BreakpointEvent::class) {
+		subscribe(JDIBreakpointEvent::class) {
 			breakpointListeners.fire(BreakpointStopEvent(
 				threadID = toThreadID(it.jdiEvent)
 			))
@@ -90,6 +95,12 @@ class VMEventBus(private val vm: VirtualMachine): DebuggeeEventBus {
 			))
 			it.resumeThreads = false
 		}
+		subscribe(JDIThreadStartEvent::class) {
+			threadListeners.fire(ThreadEvent)
+		}
+		subscribe(JDIThreadDeathEvent::class) {
+			threadListeners.fire(ThreadEvent)
+		}
 	}
 
 	private fun toThreadID(event: JDILocatableEvent) = event.thread().uniqueID()