From 137ee8f6afdc8f64f995d0fadb1bfab709114e82 Mon Sep 17 00:00:00 2001 From: Alexander Shparun Date: Wed, 18 Sep 2024 04:46:41 +0200 Subject: [PATCH] [fleet] reformat, dead code GitOrigin-RevId: 11175e0ad26c8d37505e087eda48133c89c8e89e --- .../src/fleet/rpc/server/RequestDispatcher.kt | 49 +++++-------------- 1 file changed, 13 insertions(+), 36 deletions(-) diff --git a/fleet/rpc.server/src/fleet/rpc/server/RequestDispatcher.kt b/fleet/rpc.server/src/fleet/rpc/server/RequestDispatcher.kt index b5204164d1fa..731e07d47960 100644 --- a/fleet/rpc.server/src/fleet/rpc/server/RequestDispatcher.kt +++ b/fleet/rpc.server/src/fleet/rpc/server/RequestDispatcher.kt @@ -18,17 +18,21 @@ enum class EndpointKind { } interface RequestDispatcher { - suspend fun handleConnection(route: UID, - endpoint: EndpointKind, - presentableName: String? = null, - send: SendChannel, - receive: ReceiveChannel) + suspend fun handleConnection( + route: UID, + endpoint: EndpointKind, + presentableName: String? = null, + send: SendChannel, + receive: ReceiveChannel, + ) } -suspend fun RequestDispatcher.serveRpc(route: UID, - json: () -> Serialization, - services: RpcServiceLocator, - interceptor: RpcExecutorMiddleware = RpcExecutorMiddleware) { +suspend fun RequestDispatcher.serveRpc( + route: UID, + json: () -> Serialization, + services: RpcServiceLocator, + interceptor: RpcExecutorMiddleware = RpcExecutorMiddleware, +) { val dispatcher = this spannedScope("serveRpc") { val (dispatcherSend, executorReceive) = channels(Channel.BUFFERED) @@ -49,30 +53,3 @@ suspend fun RequestDispatcher.serveRpc(route: UID, } } } - -private data class Handle(private val deferred: Deferred, private val job: Job) { - suspend fun await(): T = deferred.await() - suspend fun join(): Unit = job.join() - fun cancel(cause: CancellationException?): Unit = job.cancel(cause) -} - -private fun CoroutineScope.handle(body: suspend CoroutineScope.(suspend (T) -> Unit) -> Unit): Handle { - val deferred = CompletableDeferred() - val job = launch(start = CoroutineStart.ATOMIC) { - body { t -> - check(deferred.complete(t)) { "Subsequent invocations make no sense" } - awaitCancellation() - } - }.apply { - invokeOnCompletion { cause -> - if (cause != null) { - deferred.completeExceptionally(cause) - } - else { - deferred.completeExceptionally(RuntimeException("job has finished")) - } - } - } - return Handle(deferred, job) -} -