Remove use of NIOAtomics in favor of Atomics (#120)

remove use of NIOAtomic in favor of swift-atomics
vapor · Aug 8, 2022 · 2d9d218 · 2d9d218
1 parent efb1bd5
commit 2d9d218
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Package.swift b/Package.swift
@@ -15,6 +15,7 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.33.0"),
         .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.14.0"),
         .package(url: "https://github.com/apple/swift-nio-transport-services.git", from: "1.11.4"),
+        .package(url: "https://github.com/apple/swift-atomics.git", from: "1.0.2"),
     ],
     targets: [
         .target(name: "WebSocketKit", dependencies: [
@@ -26,6 +27,7 @@ let package = Package(
             .product(name: "NIOSSL", package: "swift-nio-ssl"),
             .product(name: "NIOWebSocket", package: "swift-nio"),
             .product(name: "NIOTransportServices", package: "swift-nio-transport-services"),
+            .product(name: "Atomics", package: "swift-atomics")
         ]),
         .testTarget(name: "WebSocketKitTests", dependencies: [
             .target(name: "WebSocketKit"),

diff --git a/Sources/WebSocketKit/WebSocketClient.swift b/Sources/WebSocketKit/WebSocketClient.swift
@@ -5,6 +5,7 @@ import NIOHTTP1
 import NIOWebSocket
 import NIOSSL
 import NIOTransportServices
+import Atomics
 
 public final class WebSocketClient {
     public enum Error: Swift.Error, LocalizedError {
@@ -37,7 +38,7 @@ public final class WebSocketClient {
     let eventLoopGroupProvider: EventLoopGroupProvider
     let group: EventLoopGroup
     let configuration: Configuration
-    let isShutdown = NIOAtomic.makeAtomic(value: false)
+    let isShutdown = ManagedAtomic(false)
 
     public init(eventLoopGroupProvider: EventLoopGroupProvider, configuration: Configuration = .init()) {
         self.eventLoopGroupProvider = eventLoopGroupProvider
@@ -135,7 +136,11 @@ public final class WebSocketClient {
         case .shared:
             return
         case .createNew:
-            if self.isShutdown.compareAndExchange(expected: false, desired: true) {
+            if self.isShutdown.compareExchange(
+                expected: false,
+                desired: true,
+                ordering: .relaxed
+            ).exchanged {
                 try self.group.syncShutdownGracefully()
             } else {
                 throw WebSocketClient.Error.alreadyShutdown
@@ -162,7 +167,7 @@ public final class WebSocketClient {
         case .shared:
             return
         case .createNew:
-            assert(self.isShutdown.load(), "WebSocketClient not shutdown before deinit.")
+            assert(self.isShutdown.load(ordering: .relaxed), "WebSocketClient not shutdown before deinit.")
         }
     }
 }