fixup

Tool: gitpod/catfood.gitpod.cloud

Author: mustard-mh

components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/AbstractGitpodPortForwardingService.kt

@@ -26,7 +26,8 @@ import java.util.*
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicReference
-import java.util.concurrent.Semaphore
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 
 @Suppress("UnstableApiUsage")
 abstract class AbstractGitpodPortForwardingService : GitpodPortForwardingService {
@@ -52,11 +53,11 @@ abstract class AbstractGitpodPortForwardingService : GitpodPortForwardingService
     private var debounceJob: Job? = null
 
     // Batch size for port operations
-    private val BATCH_SIZE = 10
-    private val BATCH_DELAY = 100
+    private val batchSize = 10
+    private val batchDelay = 100L
 
-    // Semaphore to limit concurrent operations
-    private val operationSemaphore = Semaphore(10)
+    // Mutex to limit concurrent operations
+    private val operationMutex = Mutex()
 
     init { start() }
 
@@ -186,53 +187,49 @@ abstract class AbstractGitpodPortForwardingService : GitpodPortForwardingService
         // Process port changes in background with batching
         runJob(lifetime) {
             try {
-                forwardedPortsToStopForwarding.chunked(BATCH_SIZE).forEach { batch ->
+                forwardedPortsToStopForwarding.chunked(batchSize).forEach { batch ->
                     batch.forEach { port ->
-                        operationSemaphore.withPermit {
-                            stopForwarding(port)
-                        }
+                        operationMutex.withLock { stopForwarding(port) }
                     }
-                    delay(100) // Add delay between batches
+                    delay(batchDelay)
                 }
 
-                exposedPortsToStopExposingOnClient.chunked(BATCH_SIZE).forEach { batch ->
+                exposedPortsToStopExposingOnClient.chunked(batchSize).forEach { batch ->
                     batch.forEach { port ->
-                        operationSemaphore.withPermit {
-                            stopExposingOnClient(port)
-                        }
+                        operationMutex.withLock { stopExposingOnClient(port) }
                     }
-                    delay(BATCH_DELAY)
+                    delay(batchDelay)
                 }
 
-                servedPortsToStartForwarding.chunked(BATCH_SIZE).forEach { batch ->
+                servedPortsToStartForwarding.chunked(batchSize).forEach { batch ->
                     batch.forEach { port ->
-                        operationSemaphore.withPermit {
+                        operationMutex.withLock {
                             startForwarding(port)
                             allPortsToKeep.add(port.localPort)
                         }
                     }
-                    delay(BATCH_DELAY)
+                    delay(batchDelay)
                 }
 
-                exposedPortsToStartExposingOnClient.chunked(BATCH_SIZE).forEach { batch ->
+                exposedPortsToStartExposingOnClient.chunked(batchSize).forEach { batch ->
                     batch.forEach { port ->
-                        operationSemaphore.withPermit {
+                        operationMutex.withLock {
                             startExposingOnClient(port)
                             allPortsToKeep.add(port.localPort)
                         }
                     }
-                    delay(BATCH_DELAY)
+                    delay(batchDelay)
                 }
 
                 // Update presentation for all ports in batches
-                portsList.chunked(BATCH_SIZE).forEach { batch ->
+                portsList.chunked(batchSize).forEach { batch ->
                     application.invokeLater {
                         batch.forEach {
                             updatePortsPresentation(it)
                             allPortsToKeep.add(it.localPort)
                         }
                     }
-                    delay(BATCH_DELAY)
+                    delay(batchDelay)
                 }
 
                 cleanupUnusedLifetimes(allPortsToKeep)