Skip to content

Commit 2adca4b

Browse files
dnadobadnadoba
authored
Use swift-atomics instead of NIOAtomics (#603)
`NIOAtomics` was deprecated in apple/swift-nio#2204 in favor of `swift-atomics` https://github.com/apple/swift-atomics
1 parent 1af18d2 commit 2adca4b

File tree

5 files changed

+39
-32
lines changed

5 files changed

+39
-32
lines changed

Diff for: ‎Package.swift

+3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ let package = Package(
2727
.package(url: "https://github.com/apple/swift-nio-extras.git", from: "1.10.0"),
2828
.package(url: "https://github.com/apple/swift-nio-transport-services.git", from: "1.11.4"),
2929
.package(url: "https://github.com/apple/swift-log.git", from: "1.4.0"),
30+
.package(url: "https://github.com/apple/swift-atomics.git", from: "1.0.2"),
3031
],
3132
targets: [
3233
.target(name: "CAsyncHTTPClient"),
@@ -46,6 +47,7 @@ let package = Package(
4647
.product(name: "NIOSOCKS", package: "swift-nio-extras"),
4748
.product(name: "NIOTransportServices", package: "swift-nio-transport-services"),
4849
.product(name: "Logging", package: "swift-log"),
50+
.product(name: "Atomics", package: "swift-atomics"),
4951
]
5052
),
5153
.testTarget(
@@ -61,6 +63,7 @@ let package = Package(
6163
.product(name: "NIOHTTP2", package: "swift-nio-http2"),
6264
.product(name: "NIOSOCKS", package: "swift-nio-extras"),
6365
.product(name: "Logging", package: "swift-log"),
66+
.product(name: "Atomics", package: "swift-atomics"),
6467
],
6568
resources: [
6669
.copy("Resources/self_signed_cert.pem"),

Diff for: ‎Sources/AsyncHTTPClient/ConnectionPool/HTTPConnectionPool+Manager.swift

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15+
import Atomics
1516
import Logging
1617
import NIOConcurrencyHelpers
1718
import NIOCore
@@ -165,14 +166,14 @@ extension HTTPConnectionPool.Connection.ID {
165166
static var globalGenerator = Generator()
166167

167168
struct Generator {
168-
private let atomic: NIOAtomic<Int>
169+
private let atomic: ManagedAtomic<Int>
169170

170171
init() {
171-
self.atomic = .makeAtomic(value: 0)
172+
self.atomic = .init(0)
172173
}
173174

174175
func next() -> Int {
175-
return self.atomic.add(1)
176+
return self.atomic.loadThenWrappingIncrement(ordering: .relaxed)
176177
}
177178
}
178179
}

Diff for: ‎Tests/AsyncHTTPClientTests/HTTPClientTestUtils.swift

+13-12
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import AsyncHTTPClient
16+
import Atomics
1617
import Foundation
1718
import Logging
1819
import NIOConcurrencyHelpers
@@ -351,7 +352,7 @@ internal final class HTTPBin<RequestHandler: ChannelInboundHandler> where
351352
private let mode: Mode
352353
private let sslContext: NIOSSLContext?
353354
private var serverChannel: Channel!
354-
private let isShutdown: NIOAtomic<Bool> = .makeAtomic(value: false)
355+
private let isShutdown = ManagedAtomic(false)
355356
private let handlerFactory: (Int) -> (RequestHandler)
356357

357358
init(
@@ -376,15 +377,15 @@ internal final class HTTPBin<RequestHandler: ChannelInboundHandler> where
376377

377378
self.activeConnCounterHandler = ConnectionsCountHandler()
378379

379-
let connectionIDAtomic = NIOAtomic<Int>.makeAtomic(value: 0)
380+
let connectionIDAtomic = ManagedAtomic(0)
380381

381382
self.serverChannel = try! ServerBootstrap(group: self.group)
382383
.serverChannelOption(ChannelOptions.socket(SocketOptionLevel(SOL_SOCKET), SO_REUSEADDR), value: 1)
383384
.serverChannelInitializer { channel in
384385
channel.pipeline.addHandler(self.activeConnCounterHandler)
385386
}.childChannelInitializer { channel in
386387
do {
387-
let connectionID = connectionIDAtomic.add(1)
388+
let connectionID = connectionIDAtomic.loadThenWrappingIncrement(ordering: .relaxed)
388389

389390
if case .refuse = mode {
390391
throw HTTPBinError.refusedConnection
@@ -572,12 +573,12 @@ internal final class HTTPBin<RequestHandler: ChannelInboundHandler> where
572573
}
573574

574575
func shutdown() throws {
575-
self.isShutdown.store(true)
576+
self.isShutdown.store(true, ordering: .relaxed)
576577
try self.group.syncShutdownGracefully()
577578
}
578579

579580
deinit {
580-
assert(self.isShutdown.load(), "HTTPBin not shutdown before deinit")
581+
assert(self.isShutdown.load(ordering: .relaxed), "HTTPBin not shutdown before deinit")
581582
}
582583
}
583584

@@ -946,24 +947,24 @@ internal final class HTTPBinHandler: ChannelInboundHandler {
946947
final class ConnectionsCountHandler: ChannelInboundHandler {
947948
typealias InboundIn = Channel
948949

949-
private let activeConns = NIOAtomic<Int>.makeAtomic(value: 0)
950-
private let createdConns = NIOAtomic<Int>.makeAtomic(value: 0)
950+
private let activeConns = ManagedAtomic(0)
951+
private let createdConns = ManagedAtomic(0)
951952

952953
var createdConnections: Int {
953-
self.createdConns.load()
954+
self.createdConns.load(ordering: .relaxed)
954955
}
955956

956957
var currentlyActiveConnections: Int {
957-
self.activeConns.load()
958+
self.activeConns.load(ordering: .relaxed)
958959
}
959960

960961
func channelRead(context: ChannelHandlerContext, data: NIOAny) {
961962
let channel = self.unwrapInboundIn(data)
962963

963-
_ = self.activeConns.add(1)
964-
_ = self.createdConns.add(1)
964+
_ = self.activeConns.loadThenWrappingIncrement(ordering: .relaxed)
965+
_ = self.createdConns.loadThenWrappingIncrement(ordering: .relaxed)
965966
channel.closeFuture.whenComplete { _ in
966-
_ = self.activeConns.sub(1)
967+
_ = self.activeConns.loadThenWrappingDecrement(ordering: .relaxed)
967968
}
968969

969970
context.fireChannelRead(data)

Diff for: ‎Tests/AsyncHTTPClientTests/HTTPClientTests.swift

+16-15
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
/* NOT @testable */ import AsyncHTTPClient // Tests that need @testable go into HTTPClientInternalTests.swift
16+
import Atomics
1617
#if canImport(Network)
1718
import Network
1819
#endif
@@ -1790,16 +1791,16 @@ class HTTPClientTests: XCTestCase {
17901791
typealias InboundIn = HTTPServerRequestPart
17911792
typealias OutboundOut = HTTPServerResponsePart
17921793

1793-
let requestNumber: NIOAtomic<Int>
1794-
let connectionNumber: NIOAtomic<Int>
1794+
let requestNumber: ManagedAtomic<Int>
1795+
let connectionNumber: ManagedAtomic<Int>
17951796

1796-
init(requestNumber: NIOAtomic<Int>, connectionNumber: NIOAtomic<Int>) {
1797+
init(requestNumber: ManagedAtomic<Int>, connectionNumber: ManagedAtomic<Int>) {
17971798
self.requestNumber = requestNumber
17981799
self.connectionNumber = connectionNumber
17991800
}
18001801

18011802
func channelActive(context: ChannelHandlerContext) {
1802-
_ = self.connectionNumber.add(1)
1803+
_ = self.connectionNumber.loadThenWrappingIncrement(ordering: .relaxed)
18031804
}
18041805

18051806
func channelRead(context: ChannelHandlerContext, data: NIOAny) {
@@ -1809,7 +1810,7 @@ class HTTPClientTests: XCTestCase {
18091810
case .head, .body:
18101811
()
18111812
case .end:
1812-
let last = self.requestNumber.add(1)
1813+
let last = self.requestNumber.loadThenWrappingIncrement(ordering: .relaxed)
18131814
switch last {
18141815
case 0, 2:
18151816
context.write(self.wrapOutboundOut(.head(.init(version: .init(major: 1, minor: 1), status: .ok))),
@@ -1824,8 +1825,8 @@ class HTTPClientTests: XCTestCase {
18241825
}
18251826
}
18261827

1827-
let requestNumber = NIOAtomic<Int>.makeAtomic(value: 0)
1828-
let connectionNumber = NIOAtomic<Int>.makeAtomic(value: 0)
1828+
let requestNumber = ManagedAtomic(0)
1829+
let connectionNumber = ManagedAtomic(0)
18291830
let sharedStateServerHandler = ServerThatAcceptsThenRejects(requestNumber: requestNumber,
18301831
connectionNumber: connectionNumber)
18311832
var maybeServer: Channel?
@@ -1854,19 +1855,19 @@ class HTTPClientTests: XCTestCase {
18541855
XCTAssertNoThrow(try client.syncShutdown())
18551856
}
18561857

1857-
XCTAssertEqual(0, sharedStateServerHandler.connectionNumber.load())
1858-
XCTAssertEqual(0, sharedStateServerHandler.requestNumber.load())
1858+
XCTAssertEqual(0, sharedStateServerHandler.connectionNumber.load(ordering: .relaxed))
1859+
XCTAssertEqual(0, sharedStateServerHandler.requestNumber.load(ordering: .relaxed))
18591860
XCTAssertEqual(.ok, try client.get(url: url).wait().status)
1860-
XCTAssertEqual(1, sharedStateServerHandler.connectionNumber.load())
1861-
XCTAssertEqual(1, sharedStateServerHandler.requestNumber.load())
1861+
XCTAssertEqual(1, sharedStateServerHandler.connectionNumber.load(ordering: .relaxed))
1862+
XCTAssertEqual(1, sharedStateServerHandler.requestNumber.load(ordering: .relaxed))
18621863
XCTAssertThrowsError(try client.get(url: url).wait().status) { error in
18631864
XCTAssertEqual(.remoteConnectionClosed, error as? HTTPClientError)
18641865
}
1865-
XCTAssertEqual(1, sharedStateServerHandler.connectionNumber.load())
1866-
XCTAssertEqual(2, sharedStateServerHandler.requestNumber.load())
1866+
XCTAssertEqual(1, sharedStateServerHandler.connectionNumber.load(ordering: .relaxed))
1867+
XCTAssertEqual(2, sharedStateServerHandler.requestNumber.load(ordering: .relaxed))
18671868
XCTAssertEqual(.ok, try client.get(url: url).wait().status)
1868-
XCTAssertEqual(2, sharedStateServerHandler.connectionNumber.load())
1869-
XCTAssertEqual(3, sharedStateServerHandler.requestNumber.load())
1869+
XCTAssertEqual(2, sharedStateServerHandler.connectionNumber.load(ordering: .relaxed))
1870+
XCTAssertEqual(3, sharedStateServerHandler.requestNumber.load(ordering: .relaxed))
18701871
}
18711872

18721873
func testPoolClosesIdleConnections() {

Diff for: ‎Tests/AsyncHTTPClientTests/HTTPConnectionPool+StateTestUtils.swift

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
@testable import AsyncHTTPClient
16+
import Atomics
1617
import Dispatch
1718
import NIOConcurrencyHelpers
1819
import NIOCore
@@ -21,14 +22,14 @@ import NIOEmbedded
2122
/// An `EventLoopGroup` of `EmbeddedEventLoop`s.
2223
final class EmbeddedEventLoopGroup: EventLoopGroup {
2324
private let loops: [EmbeddedEventLoop]
24-
private let index = NIOAtomic<Int>.makeAtomic(value: 0)
25+
private let index = ManagedAtomic(0)
2526

2627
internal init(loops: Int) {
2728
self.loops = (0..<loops).map { _ in EmbeddedEventLoop() }
2829
}
2930

3031
internal func next() -> EventLoop {
31-
let index: Int = self.index.add(1)
32+
let index: Int = self.index.loadThenWrappingIncrement(ordering: .relaxed)
3233
return self.loops[index % self.loops.count]
3334
}
3435

0 commit comments

Comments
 (0)