Fix the last concurrency errors

Author: Frizlab

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

@@ -15,27 +15,28 @@ private class MemWitness {
 	}
 
 	deinit {
-		ManualDispatchMemTest.logger?.debug("Deinit memory witness")
+		ManualDispatchMemTest.unsafeLogger?.debug("Deinit memory witness")
 	}
 
 }
 
 struct ManualDispatchMemTest : ParsableCommand {
 
-	static var logger: Logger?
+	/* Only modified when the program starts. */
+	static nonisolated(unsafe) var unsafeLogger: Logger?
 
 	func run() throws {
 		LoggingSystem.bootstrap{ _ in CLTLogger(multilineMode: .allMultiline) }
 
 		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. */
+		Self.unsafeLogger = logger /* We must do this to be able to use the logger from the C handler. */
 		Conf[rootValueFor: \.signalHandling.logger]?.logLevel = .trace
 
 		let signal = Signal.interrupt
 		logger.info("Process started; monitored signal is \(signal)")
 
-		try Sigaction(handler: .ansiC({ _ in Self.logger?.debug("In sigaction handler") })).install(on: signal)
+		try Sigaction(handler: .ansiC({ _ in Self.unsafeLogger?.debug("In sigaction handler") })).install(on: signal)
 
 		let memWitness = MemWitness()
 		let s = DispatchSource.makeSignalSource(signal: signal.rawValue)

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

@@ -11,7 +11,8 @@ import SignalHandling
 
 struct ManualTest : ParsableCommand {
 
-	static var logger: Logger?
+	/* Only modified when the program starts. */
+	static nonisolated(unsafe) var unsafeLogger: Logger?
 
 	enum DelayMode : String, ExpressibleByArgument {
 		case unsig
@@ -30,14 +31,14 @@ 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. */
+		Self.unsafeLogger = logger /* We must do this to be able to use the logger from the C handler. */
 		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)
+		try Sigaction(handler: .ansiC({ _ in Self.unsafeLogger?.debug("In libxct-test-helper sigaction handler for interrupt") })).install(on: .interrupt)
+		try Sigaction(handler: .ansiC({ _ in Self.unsafeLogger?.debug("In libxct-test-helper sigaction handler for terminated") })).install(on: .terminated)
 
 		let s = DispatchSource.makeSignalSource(signal: Signal.terminated.rawValue)
-		s.setEventHandler(handler: { Self.logger?.debug("In libxct-test-helper dispatch source handler for terminated") })
+		s.setEventHandler(handler: { Self.unsafeLogger?.debug("In libxct-test-helper dispatch source handler for terminated") })
 		s.activate()
 
 		let delayedSignal = Signal.terminated

Tests/SignalHandlingTests/SignalHandlingTests.swift

@@ -2,6 +2,7 @@ import Foundation
 import XCTest
 
 import CLTLogger
+import GlobalConfModule
 import Logging
 
 @testable import SignalHandling
@@ -16,7 +17,7 @@ final class SignalHandlingTests : XCTestCase {
 
 		/* Setup the logger – Not needed for most tests as we launch an external executable to test. */
 		LoggingSystem.bootstrap{ _ in CLTLogger(multilineMode: .allMultiline) }
-		SignalHandlingConfig.logger?.logLevel = .trace
+		Conf[rootValueFor: \.signalHandling.logger]?.logLevel = .trace
 	}
 
 	func testBasicSignalDelayByUnsigaction() throws {