Code review

swift-server · Jul 8, 2021 · 0266fef · 0266fef
1 parent eac6731
commit 0266fef
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 10 deletions.
diff --git a/Sources/AsyncHTTPClient/ConnectionPool/HTTPConnectionPool+Waiter.swift b/Sources/AsyncHTTPClient/ConnectionPool/HTTPConnectionPool+Waiter.swift
@@ -24,14 +24,20 @@ extension HTTPConnectionPool {
             }
         }
 
-        let id: ID
-        let request: HTTPScheduledRequest
-        let eventLoopRequirement: EventLoop?
+        var id: ID {
+            ID(request)
+        }
+
+        var request: HTTPScheduledRequest {
+            didSet {
+                self.updateEventLoopRequirement()
+            }
+        }
+        private var eventLoopRequirement: EventLoop?
 
-        init(request: HTTPScheduledRequest, eventLoopRequirement: EventLoop?) {
-            self.id = ID(request)
+        init(request: HTTPScheduledRequest) {
             self.request = request
-            self.eventLoopRequirement = eventLoopRequirement
+            self.updateEventLoopRequirement()
         }
 
         func canBeRun(on option: EventLoop) -> Bool {
@@ -42,5 +48,16 @@ extension HTTPConnectionPool {
 
             return requirement === option
         }
+
+        private mutating func updateEventLoopRequirement() {
+            switch request.eventLoopPreference.preference {
+            case .delegateAndChannel(on: let eventLoop),
+                 .testOnly_exact(channelOn: let eventLoop, delegateOn: _):
+                self.eventLoopRequirement = eventLoop
+            case .delegate(on: _),
+                 .indifferent:
+                self.eventLoopRequirement = nil
+            }
+        }
     }
 }
diff --git a/Tests/AsyncHTTPClientTests/HTTPConnectionPool+WaiterTests.swift b/Tests/AsyncHTTPClientTests/HTTPConnectionPool+WaiterTests.swift
@@ -23,8 +23,10 @@ class HTTPConnectionPool_WaiterTests: XCTestCase {
 
         let theRightEL = eventLoopGroup.next()
         let theFalseEL = eventLoopGroup.next()
+
+        let mockRequest = MockScheduledRequest(eventLoopPreference: .init(.testOnly_exact(channelOn: theRightEL, delegateOn: theFalseEL)))
 
-        let waiter = HTTPConnectionPool.Waiter(request: MockScheduledRequest(), eventLoopRequirement: theRightEL)
+        let waiter = HTTPConnectionPool.Waiter(request: mockRequest)
 
         XCTAssertTrue(waiter.canBeRun(on: theRightEL))
         XCTAssertFalse(waiter.canBeRun(on: theFalseEL))
@@ -33,7 +35,8 @@ class HTTPConnectionPool_WaiterTests: XCTestCase {
     func testCanBeRunIfNoEventLoopIsSpecified() {
         let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 2)
 
-        let waiter = HTTPConnectionPool.Waiter(request: MockScheduledRequest(), eventLoopRequirement: nil)
+        let mockRequest = MockScheduledRequest(eventLoopPreference: .indifferent)
+        let waiter = HTTPConnectionPool.Waiter(request: mockRequest)
 
         for el in eventLoopGroup.makeIterator() {
             XCTAssertTrue(waiter.canBeRun(on: el))
@@ -42,11 +45,13 @@ class HTTPConnectionPool_WaiterTests: XCTestCase {
 }
 
 private class MockScheduledRequest: HTTPScheduledRequest {
-    init() {}
+    init(eventLoopPreference: HTTPClient.EventLoopPreference) {
+        self.eventLoopPreference = eventLoopPreference
+    }
 
     var logger: Logger { preconditionFailure("Unimplemented") }
     var connectionDeadline: NIODeadline { preconditionFailure("Unimplemented") }
-    var eventLoopPreference: HTTPClient.EventLoopPreference { preconditionFailure("Unimplemented") }
+    let eventLoopPreference: HTTPClient.EventLoopPreference
 
     func requestWasQueued(_: HTTPRequestScheduler) {
         preconditionFailure("Unimplemented")