From 3d51887c155a2948ef39634413617fb7cbe572e3 Mon Sep 17 00:00:00 2001
From: Jacek Sieka <jacek@status.im>
Date: Tue, 24 Sep 2024 11:30:05 +0200
Subject: [PATCH] move signal ignore out of `eth/common` (#734)

`net/nat` is the only place where it is used and it certainly doesn't
belong in `common`
---
 eth/common/utils.nim | 35 +----------------------------------
 eth/net/nat.nim      | 17 +++++++++++++++++
 eth/p2p/rlpx.nim     |  2 +-
 3 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/eth/common/utils.nim b/eth/common/utils.nim
index 603b00c..094aa80 100644
--- a/eth/common/utils.nim
+++ b/eth/common/utils.nim
@@ -8,14 +8,9 @@
 
 import
   std/[hashes],
-  nimcrypto/hash, stew/byteutils, metrics,
+  nimcrypto/hash, stew/byteutils,
   ./eth_types
 
-when defined(posix):
-  import std/[posix, os]
-
-export metrics
-
 proc hash*(d: MDigest): Hash {.inline.} = hash(d.data)
 
 proc parseAddress*(hexString: string): EthAddress =
@@ -23,31 +18,3 @@ proc parseAddress*(hexString: string): EthAddress =
 
 proc `$`*(a: EthAddress): string =
   a.toHex()
-
-# Block all/most signals in the current thread, so we don't interfere with regular signal
-# handling elsewhere.
-proc ignoreSignalsInThread*() =
-  when defined(posix):
-    var signalMask, oldSignalMask: Sigset
-
-    # sigprocmask() doesn't work on macOS, for multithreaded programs
-    if sigfillset(signalMask) != 0:
-      echo osErrorMsg(osLastError())
-      quit(QuitFailure)
-    when defined(boehmgc):
-      # Turns out Boehm GC needs some signals to deal with threads:
-      # https://www.hboehm.info/gc/debugging.html
-      const
-        SIGPWR = 30
-        SIGXCPU = 24
-        SIGSEGV = 11
-        SIGBUS = 7
-      if sigdelset(signalMask, SIGPWR) != 0 or
-        sigdelset(signalMask, SIGXCPU) != 0 or
-        sigdelset(signalMask, SIGSEGV) != 0 or
-        sigdelset(signalMask, SIGBUS) != 0:
-        echo osErrorMsg(osLastError())
-        quit(QuitFailure)
-    if pthread_sigmask(SIG_BLOCK, signalMask, oldSignalMask) != 0:
-      echo osErrorMsg(osLastError())
-      quit(QuitFailure)
diff --git a/eth/net/nat.nim b/eth/net/nat.nim
index 578c116..d0f82eb 100644
--- a/eth/net/nat.nim
+++ b/eth/net/nat.nim
@@ -47,6 +47,23 @@ var
 logScope:
   topics = "eth net nat"
 
+when defined(posix):
+  import std/posix
+
+# Block all/most signals in the current thread, so we don't interfere with regular signal
+# handling elsewhere.
+proc ignoreSignalsInThread() =
+  when defined(posix):
+    var signalMask, oldSignalMask: Sigset
+
+    # sigprocmask() doesn't work on macOS, for multithreaded programs
+    if sigfillset(signalMask) != 0:
+      echo osErrorMsg(osLastError())
+      quit(QuitFailure)
+    if pthread_sigmask(SIG_BLOCK, signalMask, oldSignalMask) != 0:
+      echo osErrorMsg(osLastError())
+      quit(QuitFailure)
+
 ## Also does threadvar initialisation.
 ## Must be called before redirectPorts() in each thread.
 proc getExternalIP*(natStrategy: NatStrategy, quiet = false): Opt[IpAddress] =
diff --git a/eth/p2p/rlpx.nim b/eth/p2p/rlpx.nim
index efbfb45..92c4226 100644
--- a/eth/p2p/rlpx.nim
+++ b/eth/p2p/rlpx.nim
@@ -41,7 +41,7 @@ when useSnappy:
 # "undeclared identifier: 'activeChroniclesStream'", when the code using p2p
 # does not import chronicles. Need to resolve this properly.
 export
-  options, p2pProtocol, rlp, chronicles
+  options, p2pProtocol, rlp, chronicles, metrics
 
 declarePublicGauge rlpx_connected_peers,
   "Number of connected peers in the pool"