Skip to content

Remove unneeded concurrency things #360

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

Merged
jamesward merged 5 commits into from
Dec 1, 2023
Merged

Remove unneeded concurrency things #360

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
669996c
Remove unneeded concurrency things
taer Sep 28, 2022
42f709e
Merge branch 'master' into mutexRemove
taer Jan 17, 2023
5cd9e13
Merge branch 'master' into mutexRemove
taer Mar 9, 2023
a44465b
Merge branch 'master' into mutexRemove
taer Sep 13, 2023
cd4d890
Merge branch 'master' into mutexRemove
taer Nov 30, 2023
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
22 changes: 8 additions & 14 deletions stub/src/main/java/io/grpc/kotlin/ServerCalls.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import java.util.concurrent.atomic.AtomicBoolean
import kotlin.coroutines.CoroutineContext
import io.grpc.Metadata as GrpcMetadata
Expand Down Expand Up @@ -237,26 +235,22 @@ object ServerCalls {
}

val rpcJob = CoroutineScope(context).launch {
val mutex = Mutex()
val headersSent = AtomicBoolean(false) // enforces only sending headers once
var headersSent = false
val failure = runCatching {
implementation(requests).collect {
// once we have a response message, check if we've sent headers yet - if not, do so
if (headersSent.compareAndSet(false, true)) {
mutex.withLock {
call.sendHeaders(GrpcMetadata())
}
if (!headersSent) {
call.sendHeaders(GrpcMetadata())
headersSent = true
}
readiness.suspendUntilReady()
mutex.withLock { call.sendMessage(it) }
call.sendMessage(it)
}
}.exceptionOrNull()
// check headers again once we're done collecting the response flow - if we received
// no elements or threw an exception, then we wouldn't have sent them
if (failure == null && headersSent.compareAndSet(false, true)) {
mutex.withLock {
call.sendHeaders(GrpcMetadata())
}
if (failure == null && !headersSent) {
call.sendHeaders(GrpcMetadata())
}
val closeStatus = when (failure) {
null -> Status.OK
Expand All @@ -265,7 +259,7 @@ object ServerCalls {
else -> Status.fromThrowable(failure).withCause(failure)
}
val trailers = failure?.let { Status.trailersFromThrowable(it) } ?: GrpcMetadata()
mutex.withLock { call.close(closeStatus, trailers) }
call.close(closeStatus, trailers)
}

return object: ServerCall.Listener<RequestT>() {
Expand Down