Skip to content

Debug fix #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AbdullinAM merged 6 commits into from
Mar 3, 2025
Merged

Debug fix #55

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3b7cc32
fixed debug
FerrumBrain Feb 28, 2025
e41c7da
fix
FerrumBrain Feb 28, 2025
40c9ea1
diktat fix
FerrumBrain Feb 28, 2025
1c00a00
Merge branch 'main' into kudashev/debug-fix
FerrumBrain Mar 3, 2025
b287243
pass debugger port
FerrumBrain Mar 3, 2025
7d66b6b
fixes
FerrumBrain Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions kotlinx.fuzz.gradle/src/main/kotlin/kotlinx/fuzz/gradle/KFuzzPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
return dsl.build()
}

private const val INTELLIJ_DEBUGGER_DISPATCH_PORT_VAR_NAME = "idea.debugger.dispatch.port"

@Suppress("unused")
abstract class KFuzzPlugin : Plugin<Project> {
val log = Logging.getLogger(KFuzzPlugin::class.java)!!
Expand Down Expand Up @@ -71,6 +73,7 @@

doFirst {
systemProperties(fuzzConfig.toPropertiesMap())
systemProperties[INTELLIJ_DEBUGGER_DISPATCH_PORT_VAR_NAME] = System.getProperty(INTELLIJ_DEBUGGER_DISPATCH_PORT_VAR_NAME)
}
useJUnitPlatform {
includeEngines("kotlinx.fuzz")
Expand All @@ -88,6 +91,7 @@
global.regressionEnabled = true
}.build()
systemProperties(regressionConfig.toPropertiesMap())
systemProperties[INTELLIJ_DEBUGGER_DISPATCH_PORT_VAR_NAME] = System.getProperty(INTELLIJ_DEBUGGER_DISPATCH_PORT_VAR_NAME)
}
useJUnitPlatform {
includeEngines("kotlinx.fuzz")
Expand Down
12 changes: 3 additions & 9 deletions kotlinx.fuzz.jazzer/src/main/kotlin/kotlinx/fuzz/jazzer/JazzerEngine.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import java.io.DataOutputStream
import java.io.InputStream
import java.io.ObjectInputStream
import java.io.OutputStream
import java.lang.management.ManagementFactory
import java.lang.reflect.Method
import java.net.ServerSocket
import java.net.Socket
Expand Down Expand Up @@ -45,8 +44,6 @@ class JazzerEngine(private val config: KFuzzConfig) : KFuzzEngine {
config.exceptionsDir.createDirectories()
}

private fun isDebugMode(): Boolean = ManagementFactory.getRuntimeMXBean().inputArguments.any { it.contains("-agentlib:jdwp") }

private fun getDebugSetup(intellijDebuggerDispatchPort: Int, method: Method): List<String> {
val port = ServerSocket(0).use { it.localPort }
Socket("127.0.0.1", intellijDebuggerDispatchPort).use { socket ->
Expand All @@ -73,12 +70,9 @@ class JazzerEngine(private val config: KFuzzConfig) : KFuzzEngine {
val methodConfig = config.addAnnotationParams(method.getAnnotation(KFuzzTest::class.java))
val propertiesList = methodConfig.toPropertiesMap().map { (property, value) -> "-D$property=$value" }

val debugOptions = if (isDebugMode()) {
val intellijDebuggerDispatchPort = System.getProperty(INTELLIJ_DEBUGGER_DISPATCH_PORT_VAR_NAME)!!.toInt()
getDebugSetup(intellijDebuggerDispatchPort, method)
} else {
emptyList()
}
val debugOptions = System.getProperty(INTELLIJ_DEBUGGER_DISPATCH_PORT_VAR_NAME)?.let { port ->
getDebugSetup(port.toInt(), method)
} ?: emptyList()

val exitCode = ProcessBuilder(
javaCommand,
Expand Down
Loading