Skip to content

Commit

Permalink
NIOAsyncWriter: Fix suspending yield when writer is finished (#3044)
Browse files Browse the repository at this point in the history
This fixes hitting the following preconditionFailure in NIOAsyncWriter:
"This should have already been handled by `yield()`".

It doesn't expect a yield to be suspended when the state is
`.writerFinished`, but this can definitely happen. This seemed to be the
correct solution to me, but please check it carefully, because I'm
unfamiliar with this code.

I'm not happy about the test for this. It's blocking the `didYield` call
for a while, to make sure the correct state is reached. See also the
'FIXME' line. What would be a better way to do this?

---------

Co-authored-by: Cory Benfield <[email protected]>
  • Loading branch information
orobio and Lukasa authored Jan 14, 2025
1 parent 9d7cf68 commit 6fb31ea
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 2 deletions.
35 changes: 33 additions & 2 deletions Sources/NIOCore/AsyncSequences/NIOAsyncWriter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,38 @@ extension NIOAsyncWriter {
delegate: delegate
)

case .initial, .finished, .writerFinished:
case .writerFinished(
let isWritable,
let inDelegateOutcall,
var suspendedYields,
let cancelledYields,
let bufferedYieldIDs,
let delegate,
let error
):
// We have a suspended yield at this point that hasn't been cancelled yet.
// It was buffered before we became finished, so we still have to deliver it.
// We need to store the yield now.

self._state = .modifying

let suspendedYield = SuspendedYield(
yieldID: yieldID,
continuation: continuation
)
suspendedYields.append(suspendedYield)

self._state = .writerFinished(
isWritable: isWritable,
inDelegateOutcall: inDelegateOutcall,
suspendedYields: suspendedYields,
cancelledYields: cancelledYields,
bufferedYieldIDs: bufferedYieldIDs,
delegate: delegate,
error: error
)

case .initial, .finished:
preconditionFailure("This should have already been handled by `yield()`")

case .modifying:
Expand Down Expand Up @@ -1501,7 +1532,7 @@ extension NIOAsyncWriter {

self._state = .writerFinished(
isWritable: isWritable,
inDelegateOutcall: inDelegateOutcall,
inDelegateOutcall: false,
suspendedYields: .init(),
cancelledYields: cancelledYields,
bufferedYieldIDs: bufferedYieldIDs,
Expand Down
45 changes: 45 additions & 0 deletions Tests/NIOCoreTests/AsyncSequences/NIOAsyncWriterTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,51 @@ final class NIOAsyncWriterTests: XCTestCase {
self.assert(suspendCallCount: 1, yieldCallCount: 1, terminateCallCount: 1)
}

func testSuspendingBufferedYield_whenWriterFinished() async throws {
self.sink.setWritability(to: false)

let bothSuspended = expectation(description: "suspended on both yields")
let suspendedAgain = ConditionLock(value: false)
self.delegate.didSuspendHandler = {
if self.delegate.didSuspendCallCount == 2 {
bothSuspended.fulfill()
} else if self.delegate.didSuspendCallCount > 2 {
suspendedAgain.lock()
suspendedAgain.unlock(withValue: true)
}
}

self.delegate.didYieldHandler = { _ in
if self.delegate.didYieldCallCount == 1 {
// Delay this yield until the other yield is suspended again.
// FIXME: This will never finish if no other thread is handling the other yield.
suspendedAgain.lock(whenValue: true)
suspendedAgain.unlock()
}
}

let task1 = Task { [writer] in
try await writer!.yield("message1")
}
let task2 = Task { [writer] in
try await writer!.yield("message2")
}

await fulfillment(of: [bothSuspended], timeout: 1)
self.writer.finish()

self.assert(suspendCallCount: 2, yieldCallCount: 0, terminateCallCount: 0)

// We have to become writable again to unbuffer the yields
// The first call to didYield will pause, so that the other yield will be suspended again.
self.sink.setWritability(to: true)

await XCTAssertNoThrow(try await task1.value)
await XCTAssertNoThrow(try await task2.value)

self.assert(suspendCallCount: 3, yieldCallCount: 2, terminateCallCount: 1)
}

func testWriterFinish_whenFinished() {
// This tests just checks that finishing again is a no-op
self.writer.finish()
Expand Down

0 comments on commit 6fb31ea

Please sign in to comment.