From b89d997b3b449d2d8cbe5d4de2326d75ba46fb79 Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <fabian@meumertzhe.im>
Date: Thu, 11 Aug 2022 11:41:52 +0200
Subject: all: Move SignalHandler initialization into the driver

Ensures that Ctrl+C works even with `--nohooks`.
---
 agent/src/main/java/com/code_intelligence/jazzer/agent/Agent.kt      | 3 ---
 agent/src/main/java/com/code_intelligence/jazzer/agent/BUILD.bazel   | 1 -
 agent/src/main/java/com/code_intelligence/jazzer/runtime/BUILD.bazel | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'agent/src/main/java/com')

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(
-- 
cgit v1.2.3