Fix all the concurrency warnings and errors in the main target

Author: Frizlab

Sources/SignalHandling/DelayedSigaction/DelayedSigactionHandler.swift

@@ -12,4 +12,4 @@ import Foundation
  - Parameter signal: The signal that triggered the delayed sigaction.
  - Parameter sigactionAllowedHandler: The handler to call when the sigaction can be triggered or dropped.
  - Parameter allowSigaction: Whether the sigaction handler should be called, or the signal should be dropped. */
-public typealias DelayedSigactionHandler = (_ signal: Signal, _ sigactionAllowedHandler: @escaping (_ allowSigaction: Bool) -> Void) -> Void
+public typealias DelayedSigactionHandler = (_ signal: Signal, _ sigactionAllowedHandler: @escaping @Sendable (_ allowSigaction: Bool) -> Void) -> Void

Sources/SignalHandling/DelayedSigaction/SigactionDelayer_Block.swift

@@ -64,6 +64,7 @@ public enum SigactionDelayer_Block {
 	 - Important: Must be called before any thread is spawned.
 	 - Important: You should not use `pthread_sigmask` to sigprocmask (nor anything to unblock signals) after calling this method. */
 	public static func bootstrap(for signals: Set<Signal>) throws {
+		assert(!Thread.isMultiThreaded())
 		guard !bootstrapDone else {
 			fatalError("DelayedSigaction can be bootstrapped only once")
 		}
@@ -93,7 +94,10 @@ public enum SigactionDelayer_Block {
 			}
 		}
 		group.wait()
+		
 		if let e = error {throw e}
+		/* NOT in a defer as we do not want this to be set to true if the error check above throws. */
+		bootstrapDone = true
 	}
 
 	public static func registerDelayedSigaction(_ signal: Signal, handler: @escaping DelayedSigactionHandler) throws -> DelayedSigaction {
@@ -175,8 +179,9 @@ public enum SigactionDelayer_Block {
 
 		static let lock = NSConditionLock(condition: Self.nothingToDo.rawValue)
 
-		static var action: Action = .nop
-		static var error: Error?
+		/* Read/write is protected by the lock above. */
+		static nonisolated(unsafe) var action: Action = .nop
+		static nonisolated(unsafe) var error: Error?
 
 		case nothingToDo
 		case actionInThread
@@ -193,8 +198,10 @@ public enum SigactionDelayer_Block {
 
 	private static let signalProcessingQueue = DispatchQueue(label: "com.xcode-actions.blocked-signals-processing-queue")
 
-	private static var bootstrapDone = false
-	private static var blockedSignals = [Signal: BlockedSignal]()
+	/* Only used on the main thread. */
+	private static nonisolated(unsafe) var bootstrapDone = false
+	/* Only used in the signals processing queue. */
+	private static nonisolated(unsafe) var blockedSignals = [Signal: BlockedSignal]()
 
 	private static func executeOnThread(_ action: ThreadSync.Action) throws {
 		do {
@@ -323,18 +330,22 @@ public enum SigactionDelayer_Block {
 		}
 
 		for _ in 0..<count {
+			let lock = NSLock()
 			let group = DispatchGroup()
-			var runOriginalHandlerFinal = true
+			nonisolated(unsafe) var runOriginalHandlerFinal = true
 			for (_, handler) in blockedSignal.handlers {
 				group.enter()
 				handler(signal, { runOriginalHandler in
-					runOriginalHandlerFinal = runOriginalHandlerFinal && runOriginalHandler
+					lock.withLock{
+						runOriginalHandlerFinal = runOriginalHandlerFinal && runOriginalHandler
+					}
 					group.leave()
 				})
 			}
 			group.wait()
 
-			/* All the handlers have responded, we now know whether to allow or drop the signal. */
+			/* All the handlers have responded, we now know whether to allow or drop the signal.
+			 * No need to lock the lock to access runOriginalHandlerFinal here as all possible changes are finished by now. */
 			do {try executeOnThread(runOriginalHandlerFinal ? .suspend(for: signal) : .drop(signal))}
 			catch {
 				Conf.logger?.error(

Sources/SignalHandling/DelayedSigaction/SigactionDelayer_Unsig.swift

@@ -100,7 +100,7 @@ public enum SigactionDelayer_Unsig {
 	   MARK: - Private
 	   *************** */
 
-	private enum ThreadSync : Int {
+	private enum ThreadSync : Int, Sendable {
 
 		enum Action {
 			case nop
@@ -132,8 +132,9 @@ public enum SigactionDelayer_Unsig {
 
 		static let lock = NSConditionLock(condition: Self.nothingToDo.rawValue)
 
-		static var action: Action = .nop
-		static var completionResult: ErrorAndLogs?
+		/* Read/write is protected by the lock above. */
+		static nonisolated(unsafe) var action: Action = .nop
+		static nonisolated(unsafe) var completionResult: ErrorAndLogs?
 
 		case nothingToDo
 		case actionInThread
@@ -152,8 +153,9 @@ public enum SigactionDelayer_Unsig {
 
 	private static let signalProcessingQueue = DispatchQueue(label: "com.xcode-actions.unsigactioned-signals-processing-queue")
 
-	private static var hasCreatedProcessingThread = false
-	private static var unsigactionedSignals = [Signal: UnsigactionedSignal]()
+	/* Both these vars are only modified/read on the signal processing queue. */
+	private static nonisolated(unsafe) var hasCreatedProcessingThread = false
+	private static nonisolated(unsafe) var unsigactionedSignals = [Signal: UnsigactionedSignal]()
 
 	private static func executeOnThread(_ action: ThreadSync.Action) throws {
 		try createProcessingThreadIfNeededOnQueue()
@@ -270,16 +272,21 @@ public enum SigactionDelayer_Unsig {
 		Conf.logger?.trace("", metadata: ["signal": "\(signal)", "original-sigaction": "\(unsigactionedSignal.originalSigaction)"])
 
 		for _ in 0..<count {
+			let lock = NSLock()
 			let group = DispatchGroup()
-			var runOriginalHandlerFinal = true
+			nonisolated(unsafe) var runOriginalHandlerFinal = true
 			for (_, handler) in unsigactionedSignal.handlers {
 				group.enter()
 				handler(signal, { runOriginalHandler in
-					runOriginalHandlerFinal = runOriginalHandlerFinal && runOriginalHandler
+					lock.withLock{
+						runOriginalHandlerFinal = runOriginalHandlerFinal && runOriginalHandler
+					}
 					group.leave()
 				})
 			}
 			group.wait()
+			
+			/* No need to lock the lock to access runOriginalHandlerFinal here as all possible changes are finished by now. */
 			if runOriginalHandlerFinal {
 				Conf.logger?.trace("Resending signal.", metadata: ["signal": "\(signal)"])
 				do    {try executeOnThread(.send(signal, with: unsigactionedSignal.originalSigaction))}

Sources/signal-handling-tests-helper/DelaySignalUnsigaction.swift

@@ -2,6 +2,7 @@ import Foundation
 
 import ArgumentParser
 import CLTLogger
+import GlobalConfModule
 import Logging
 
 import SignalHandling
@@ -15,7 +16,7 @@ struct DelaySignalUnsigaction : ParsableCommand {
 
 	func run() throws {
 		LoggingSystem.bootstrap{ _ in CLTLogger(multilineMode: .allMultiline) }
-		SignalHandlingConfig.logger?.logLevel = .trace
+		Conf[rootValueFor: \.signalHandling.logger]?.logLevel = .trace
 
 		let signal = Signal(rawValue: signalNumber)
 

Sources/signal-handling-tests-helper/ManualDispatchMemTest.swift

@@ -2,6 +2,7 @@ import Foundation
 
 import ArgumentParser
 import CLTLogger
+import GlobalConfModule
 import Logging
 
 import SignalHandling
@@ -29,7 +30,7 @@ struct ManualDispatchMemTest : ParsableCommand {
 		var logger = Logger(label: "main")
 		logger.logLevel = .trace
 		Self.logger = logger /* We must do this to be able to use the logger from the C handler. */
-		SignalHandlingConfig.logger?.logLevel = .trace
+		Conf[rootValueFor: \.signalHandling.logger]?.logLevel = .trace
 
 		let signal = Signal.interrupt
 		logger.info("Process started; monitored signal is \(signal)")

Sources/signal-handling-tests-helper/ManualTest.swift

@@ -2,6 +2,7 @@ import Foundation
 
 import ArgumentParser
 import CLTLogger
+import GlobalConfModule
 import Logging
 
 import SignalHandling
@@ -30,7 +31,7 @@ struct ManualTest : ParsableCommand {
 		var logger = Logger(label: "main")
 		logger.logLevel = .trace
 		Self.logger = logger /* We must do this to be able to use the logger from the C handler. */
-		SignalHandlingConfig.logger?.logLevel = .trace
+		Conf[rootValueFor: \.signalHandling.logger]?.logLevel = .trace
 
 		try Sigaction(handler: .ansiC({ _ in Self.logger?.debug("In libxct-test-helper sigaction handler for interrupt") })).install(on: .interrupt)
 		try Sigaction(handler: .ansiC({ _ in Self.logger?.debug("In libxct-test-helper sigaction handler for terminated") })).install(on: .terminated)

Sources/signal-handling-tests-helper/main.swift

@@ -6,7 +6,7 @@ import ArgumentParser
 
 struct SignalHandlingTestsHelper : ParsableCommand {
 
-	static var configuration = CommandConfiguration(
+	static let configuration = CommandConfiguration(
 		subcommands: [
 			ManualTest.self,
 			ManualDispatchMemTest.self,