Skip to content

Fix race condition in AsyncCurrentValueSubject #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix race condition in AsyncCurrentValueSubject #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f0729e
Merge pull request #33 from sideeffect-io/release/0.5.2
twittemb Jan 3, 2023
fc0dc63
Fix race condition in `AsyncCurrentValueSubject`
wfltaylor Jan 31, 2024
29ad29a
Fix race condition in `AsyncThrowingCurrentValueSubject`
wfltaylor Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Sources/AsyncSubjects/AsyncCurrentValueSubject.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,19 @@ public final class AsyncCurrentValueSubject<Element>: AsyncSubject where Element
func handleNewConsumer() -> (iterator: AsyncBufferedChannel<Element>.Iterator, unregister: @Sendable () -> Void) {
let asyncBufferedChannel = AsyncBufferedChannel<Element>()

let (terminalState, current) = self.state.withCriticalRegion { state -> (Termination?, Element) in
(state.terminalState, state.current)
let terminalState = self.state.withCriticalRegion { state -> Termination? in
state.terminalState
}

if let terminalState = terminalState, terminalState.isFinished {
asyncBufferedChannel.finish()
return (asyncBufferedChannel.makeAsyncIterator(), {})
}

asyncBufferedChannel.send(current)

let consumerId = self.state.withCriticalRegion { state -> Int in
state.ids += 1
state.channels[state.ids] = asyncBufferedChannel
asyncBufferedChannel.send(state.current)
return state.ids
}

Expand Down
7 changes: 3 additions & 4 deletions Sources/AsyncSubjects/AsyncThrowingCurrentValueSubject.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ public final class AsyncThrowingCurrentValueSubject<Element, Failure: Error>: As
) -> (iterator: AsyncThrowingBufferedChannel<Element, Error>.Iterator, unregister: @Sendable () -> Void) {
let asyncBufferedChannel = AsyncThrowingBufferedChannel<Element, Error>()

let (terminalState, current) = self.state.withCriticalRegion { state -> (Termination?, Element) in
(state.terminalState, state.current)
let terminalState = self.state.withCriticalRegion { state -> Termination? in
state.terminalState
}

if let terminalState = terminalState {
Expand All @@ -111,11 +111,10 @@ public final class AsyncThrowingCurrentValueSubject<Element, Failure: Error>: As
return (asyncBufferedChannel.makeAsyncIterator(), {})
}

asyncBufferedChannel.send(current)

let consumerId = self.state.withCriticalRegion { state -> Int in
state.ids += 1
state.channels[state.ids] = asyncBufferedChannel
asyncBufferedChannel.send(state.current)
return state.ids
}

Expand Down