EventLoop preferences (#415)

Author: fabianfett

Sources/AsyncHTTPClient/ConnectionPool/HTTPConnectionPool.swift

@@ -149,12 +149,15 @@ extension HTTPConnectionPool{
 }
 
 varrequiredEventLoop:EventLoop?{
-switchself.req.eventLoopPreference.preference {
-case.indifferent,.delegate:
-returnnil
-case.delegateAndChannel(on:let eventLoop),.testOnly_exact(channelOn:let eventLoop, delegateOn: _):
-return eventLoop
-}
+self.req.requiredEventLoop
+}
+
+varpreferredEventLoop:EventLoop{
+self.req.preferredEventLoop
+}
+
+varconnectionDeadline:NIODeadline?{
+self.req.connectionDeadline
 }
 
 func __testOnly_wrapped_request()->HTTPSchedulableRequest{

Sources/AsyncHTTPClient/ConnectionPool/HTTPExecutableRequest.swift

@@ -146,8 +146,12 @@ protocol HTTPSchedulableRequest: HTTPExecutableRequest{
  /// A connection to run this task on needs to be found before this deadline!
 varconnectionDeadline:NIODeadline{get}
 
- /// The task's `EventLoop` preference
-vareventLoopPreference:HTTPClient.EventLoopPreference{get}
+ /// The user has expressed an intent for this request to be executed on this EventLoop. If a
+ /// connection is available on another one, just use the one handy.
+varpreferredEventLoop:EventLoop{get}
+
+ /// The user required the request to be executed on a connection that is handled by this EventLoop.
+varrequiredEventLoop:EventLoop?{get}
 
  /// Informs the task, that it was queued for execution
  ///

Sources/AsyncHTTPClient/RequestBag.swift

@@ -335,6 +335,26 @@ extension RequestBag: HTTPSchedulableRequest{
 }
 
 extensionRequestBag:HTTPExecutableRequest{
+varrequiredEventLoop:EventLoop?{
+switchself.eventLoopPreference.preference {
+case.indifferent,.delegate:
+returnnil
+case.delegateAndChannel(on:let eventLoop),.testOnly_exact(channelOn:let eventLoop, delegateOn: _):
+return eventLoop
+}
+}
+
+varpreferredEventLoop:EventLoop{
+switchself.eventLoopPreference.preference {
+case.indifferent:
+returnself.task.eventLoop
+case.delegate(let eventLoop),
+.delegateAndChannel(on:let eventLoop),
+.testOnly_exact(channelOn:let eventLoop, delegateOn: _):
+return eventLoop
+}
+}
+
 func willExecuteRequest(_ executor:HTTPRequestExecutor){
 ifself.task.eventLoop.inEventLoop {
 self.willExecuteRequest0(executor)

Tests/AsyncHTTPClientTests/HTTPConnectionPool+RequestQueueTests.swift

@@ -24,14 +24,14 @@ class HTTPConnectionPool_RequestQueueTests: XCTestCase{
 varqueue=HTTPConnectionPool.RequestQueue()
 XCTAssertTrue(queue.isEmpty)
 XCTAssertEqual(queue.count,0)
-letreq1=MockScheduledRequest(eventLoopPreference:.indifferent)
+letreq1=MockScheduledRequest(requiredEventLoop:nil)
 letreq1ID= queue.push(.init(req1))
 XCTAssertFalse(queue.isEmpty)
 XCTAssertFalse(queue.isEmpty(for:nil))
 XCTAssertEqual(queue.count,1)
 XCTAssertEqual(queue.count(for:nil),1)
 
-letreq2=MockScheduledRequest(eventLoopPreference:.indifferent)
+letreq2=MockScheduledRequest(requiredEventLoop:nil)
 letreq2ID= queue.push(.init(req2))
 XCTAssertEqual(queue.count,2)
 
@@ -47,7 +47,7 @@ class HTTPConnectionPool_RequestQueueTests: XCTestCase{
 
 XCTAssertTrue(queue.isEmpty(for: eventLoop))
 XCTAssertEqual(queue.count(for: eventLoop),0)
-letreq3=MockScheduledRequest(eventLoopPreference:.delegateAndChannel(on:eventLoop))
+letreq3=MockScheduledRequest(requiredEventLoop:eventLoop)
 letreq3ID= queue.push(.init(req3))
 XCTAssertFalse(queue.isEmpty(for: eventLoop))
 XCTAssertEqual(queue.count(for: eventLoop),1)
@@ -60,13 +60,13 @@ class HTTPConnectionPool_RequestQueueTests: XCTestCase{
 XCTAssertTrue(queue.isEmpty)
 XCTAssertEqual(queue.count,0)
 
-letreq4=MockScheduledRequest(eventLoopPreference:.delegateAndChannel(on:eventLoop))
+letreq4=MockScheduledRequest(requiredEventLoop:eventLoop)
 letreq4ID= queue.push(.init(req4))
 XCTAssert(queue.remove(req4ID)?.__testOnly_wrapped_request()=== req4)
 
-letreq5=MockScheduledRequest(eventLoopPreference:.indifferent)
+letreq5=MockScheduledRequest(requiredEventLoop:nil)
  queue.push(.init(req5))
-letreq6=MockScheduledRequest(eventLoopPreference:.delegateAndChannel(on:eventLoop))
+letreq6=MockScheduledRequest(requiredEventLoop:eventLoop)
  queue.push(.init(req6))
 letall= queue.removeAll()
 lettestSet= all.map{ $0.__testOnly_wrapped_request()}
@@ -82,13 +82,15 @@ class HTTPConnectionPool_RequestQueueTests: XCTestCase{
 }
 
 privateclassMockScheduledRequest:HTTPSchedulableRequest{
-init(eventLoopPreference:HTTPClient.EventLoopPreference){
-self.eventLoopPreference = eventLoopPreference
+letrequiredEventLoop:EventLoop?
+
+init(requiredEventLoop:EventLoop?){
+self.requiredEventLoop = requiredEventLoop
 }
 
 varlogger:Logger{preconditionFailure("Unimplemented")}
 varconnectionDeadline:NIODeadline{preconditionFailure("Unimplemented")}
-leteventLoopPreference:HTTPClient.EventLoopPreference
+varpreferredEventLoop:EventLoop{preconditionFailure("Unimplemented")}
 
 func requestWasQueued(_:HTTPRequestScheduler){
 preconditionFailure("Unimplemented")