diff options
| author | Fabian Meumertzheim <fabian@meumertzhe.im> | 2022-08-11 11:41:52 +0200 |
|---|---|---|
| committer | Fabian Meumertzheim <fabian@meumertzhe.im> | 2022-08-15 22:27:22 +0200 |
| commit | b89d997b3b449d2d8cbe5d4de2326d75ba46fb79 (patch) | |
| tree | e90fa64ec195d7ab2f9c5900f5bd2239ffc4a3e1 /agent/src/main/java/com | |
| parent | 193908f37c4888e1feb931978a37a874b9e3d250 (diff) | |
| download | jazzer-api-b89d997b3b449d2d8cbe5d4de2326d75ba46fb79.tar.gz | |
all: Move SignalHandler initialization into the driver
Ensures that Ctrl+C works even with `--nohooks`.
Diffstat (limited to 'agent/src/main/java/com')
3 files changed, 1 insertions, 5 deletions
diff --git a/agent/src/main/java/com/code_intelligence/jazzer/agent/Agent.kt b/agent/src/main/java/com/code_intelligence/jazzer/agent/Agent.kt index f5fee3a2..e4591dd6 100644 --- a/agent/src/main/java/com/code_intelligence/jazzer/agent/Agent.kt +++ b/agent/src/main/java/com/code_intelligence/jazzer/agent/Agent.kt @@ -21,7 +21,6 @@ import com.code_intelligence.jazzer.instrumentor.CoverageRecorder import com.code_intelligence.jazzer.instrumentor.Hooks import com.code_intelligence.jazzer.instrumentor.InstrumentationType import com.code_intelligence.jazzer.runtime.NativeLibHooks -import com.code_intelligence.jazzer.runtime.SignalHandler import com.code_intelligence.jazzer.runtime.TraceCmpHooks import com.code_intelligence.jazzer.runtime.TraceDivHooks import com.code_intelligence.jazzer.runtime.TraceIndirHooks @@ -183,6 +182,4 @@ fun premain(agentArgs: String?, instrumentation: Instrumentation) { println("WARN: ${classesToRetransform.joinToString()}") } } - - SignalHandler.initialize() } diff --git a/agent/src/main/java/com/code_intelligence/jazzer/agent/BUILD.bazel b/agent/src/main/java/com/code_intelligence/jazzer/agent/BUILD.bazel index 84dd4c19..db6ae264 100644 --- a/agent/src/main/java/com/code_intelligence/jazzer/agent/BUILD.bazel +++ b/agent/src/main/java/com/code_intelligence/jazzer/agent/BUILD.bazel @@ -11,7 +11,6 @@ kt_jvm_library( deps = [ "//agent/src/main/java/com/code_intelligence/jazzer/instrumentor", "//agent/src/main/java/com/code_intelligence/jazzer/runtime", - "//agent/src/main/java/com/code_intelligence/jazzer/runtime:signal_handler", "//driver/src/main/java/com/code_intelligence/jazzer/driver:opt", ], ) diff --git a/agent/src/main/java/com/code_intelligence/jazzer/runtime/BUILD.bazel b/agent/src/main/java/com/code_intelligence/jazzer/runtime/BUILD.bazel index b6a0ad03..b408e985 100644 --- a/agent/src/main/java/com/code_intelligence/jazzer/runtime/BUILD.bazel +++ b/agent/src/main/java/com/code_intelligence/jazzer/runtime/BUILD.bazel @@ -44,7 +44,7 @@ jni_headers( java_library( name = "signal_handler", srcs = ["SignalHandler.java"], - visibility = ["//agent/src/main/java/com/code_intelligence/jazzer/agent:__pkg__"], + visibility = ["//driver/src/main/java/com/code_intelligence/jazzer/driver:__pkg__"], ) jni_headers( |