add docker compose setup for swift 5.8

motivation: prepare for swift 5.8

changes:
* update use of Locks to address NIO warnings
* update docker compose setup to use release version of 5.7
* add docker compose setup for nightly 5.8

Author: tomerd

Sources/Lifecycle/Lifecycle.swift

@@ -345,7 +345,7 @@ public struct ServiceLifecycle {
 
 extension ServiceLifecycle {
     private static var trapped: Set<Int32> = []
-    private static let trappedLock = Lock()
+    private static let trappedLock = LifecycleLock()
 
     /// Setup a signal trap.
     ///
@@ -468,7 +468,7 @@ public class ComponentLifecycle: LifecycleTask {
     fileprivate let shutdownGroup = DispatchGroup()
 
     private var state = State.idle(Registry())
-    private let stateLock = Lock()
+    private let stateLock = LifecycleLock()
 
     /// Creates a ``ComponentLifecycle`` instance.
     ///
@@ -849,7 +849,7 @@ internal class StatefulLifecycleTask<State>: LifecycleTask {
     let start: LifecycleStartHandler<State>
     let shutdown: LifecycleShutdownHandler<State>
 
-    let stateLock = Lock()
+    let stateLock = LifecycleLock()
     var state: State?
 
     init(label: String, start: LifecycleStartHandler<State>, shutdown: LifecycleShutdownHandler<State>) {
@@ -887,7 +887,7 @@ private class Registry {
 
     private var _tasks: [LifecycleTask] = []
     private var keys: [LifecycleTasksContainer.RegistrationKey] = []
-    private let lock = Lock()
+    private let lock = LifecycleLock()
 
     func add(_ tasks: [LifecycleTask]) -> [RegistrationKey] {
         // FIXME: better id generation scheme (cant use UUID)

Sources/Lifecycle/Locks.swift

@@ -37,7 +37,7 @@ import Glibc
 /// This object provides a lock on top of a single `pthread_mutex_t`. This kind
 /// of lock is safe to use with `libpthread`-based threading models, such as the
 /// one used by NIO.
-internal final class Lock {
+internal final class LifecycleLock {
     private let mutex: UnsafeMutablePointer<pthread_mutex_t> = UnsafeMutablePointer.allocate(capacity: 1)
 
     /// Create a new lock.
@@ -71,7 +71,7 @@ internal final class Lock {
     }
 }
 
-extension Lock {
+extension LifecycleLock {
     /// Acquire the lock for the duration of the given block.
     ///
     /// This convenience method should be preferred to `lock` and `unlock` in

Tests/LifecycleTests/ComponentLifecycleTests.swift

@@ -844,7 +844,7 @@ final class ComponentLifecycleTests: XCTestCase {
             }
 
             var state = State.idle
-            let stateLock = Lock()
+            let stateLock = LifecycleLock()
 
             let queue = DispatchQueue(label: "test")
 
@@ -929,7 +929,7 @@ final class ComponentLifecycleTests: XCTestCase {
         }
 
         var state = State.idle
-        let stateLock = Lock()
+        let stateLock = LifecycleLock()
 
         let expectedData = UUID().uuidString
         let item = Item(expectedData)
@@ -1677,7 +1677,7 @@ final class ComponentLifecycleTests: XCTestCase {
 class TestMetrics: MetricsFactory, RecorderHandler {
     var counters = [String: TestCounter]()
     var timers = [String: TestTimer]()
-    let lock = Lock()
+    let lock = LifecycleLock()
 
     public init() {}
 
@@ -1711,7 +1711,7 @@ class TestMetrics: MetricsFactory, RecorderHandler {
     class TestCounter: CounterHandler {
         let label: String
         var _value: Int64
-        let lock = Lock()
+        let lock = LifecycleLock()
 
         init(label: String) {
             self.label = label
@@ -1740,7 +1740,7 @@ class TestMetrics: MetricsFactory, RecorderHandler {
     class TestTimer: TimerHandler {
         let label: String
         var _value: Int64
-        let lock = Lock()
+        let lock = LifecycleLock()
 
         init(label: String) {
             self.label = label

Tests/LifecycleTests/Helpers.swift

@@ -25,7 +25,7 @@ class GoodItem: LifecycleTask {
     let shutdownDelay: Double
 
     var state = State.idle
-    let stateLock = Lock()
+    let stateLock = LifecycleLock()
 
     init(id: String = UUID().uuidString,
          startDelay: Double = Double.random(in: 0.01 ... 0.1),
@@ -67,7 +67,7 @@ class NIOItem {
     let shutdownDelay: Int64
 
     var state = State.idle
-    let stateLock = Lock()
+    let stateLock = LifecycleLock()
 
     init(eventLoopGroup: EventLoopGroup,
          id: String = UUID().uuidString,

docker/docker-compose.2004.57.yaml

@@ -6,7 +6,8 @@ services:
     image: swift-service-lifecycle:20.04-5.7
     build:
       args:
-        base_image: "swiftlang/swift:nightly-main-focal"
+        ubuntu_version: "focal"
+        swift_version: "5.7"
 
   test:
     image: swift-service-lifecycle:20.04-5.7

docker/docker-compose.2004.58.yaml

@@ -0,0 +1,18 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-service-lifecycle:20.04-5.8
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-5.8-focal"
+
+  test:
+    image: swift-service-lifecycle:20.04-5.8
+    environment:
+      - SKIP_SIGNAL_TEST=true
+      - FORCE_TEST_DISCOVERY=--enable-test-discovery
+
+  shell:
+    image: swift-service-lifecycle:20.04-5.8