refactor: replace synchronized collections with ConcurrentHashMap and ConcurrentLinkedQueue

Author: twisti-dev

surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/ConnectionImpl.kt

@@ -712,7 +712,6 @@ class ConnectionImpl(
             handleDisconnection()
         }
 
-
         this.averageSentPackets = lerp(
             0.75f, this.sentPackets.toFloat(),
             this.averageSentPackets

surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/RespondingPacketSendHandler.kt

@@ -6,7 +6,6 @@ import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
 import dev.slne.surf.cloud.api.common.util.netty.UnifiedReadOnlyChannelHandler
 import dev.slne.surf.surfapi.core.api.util.logger
 import dev.slne.surf.surfapi.core.api.util.mutableObject2ObjectMapOf
-import dev.slne.surf.surfapi.core.api.util.synchronize
 import io.netty.channel.ChannelHandlerContext
 import io.netty.channel.ChannelPromise
 import kotlinx.coroutines.CompletableDeferred
@@ -16,7 +15,7 @@ import java.util.*
 class RespondingPacketSendHandler : UnifiedReadOnlyChannelHandler<NettyPacket>() {
     private val log = logger()
     private val respondingPackets =
-        mutableObject2ObjectMapOf<UUID, CompletableDeferred<ResponseNettyPacket>>().synchronize()
+        mutableObject2ObjectMapOf<UUID, CompletableDeferred<ResponseNettyPacket>>()
 
     @Suppress("DEPRECATION")
     override fun handleRead(
@@ -49,7 +48,7 @@ class RespondingPacketSendHandler : UnifiedReadOnlyChannelHandler<NettyPacket>()
         }
     }
 
-    @Suppress("DEPRECATION")
+    @Suppress("UNCHECKED_CAST")
     override fun handleWrite(
         ctx: ChannelHandlerContext,
         msg: NettyPacket,

surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/TickablePacketListener.kt

@@ -1,9 +1,7 @@
 package dev.slne.surf.cloud.core.common.netty.network
 
-import dev.slne.surf.surfapi.core.api.util.mutableObjectListOf
-import dev.slne.surf.surfapi.core.api.util.synchronize
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
+import dev.slne.surf.surfapi.core.api.util.logger
+import java.util.concurrent.ConcurrentLinkedQueue
 
 interface TickablePacketListener : PacketListener {
 
@@ -14,22 +12,31 @@ interface TickablePacketListener : PacketListener {
 }
 
 abstract class CommonTickablePacketListener : TickablePacketListener {
-    private val schedules = mutableObjectListOf<suspend () -> Unit>().synchronize()
-    private val schedulesMutex = Mutex()
+    companion object {
+        private val log = logger()
+    }
+
+    private val schedules = ConcurrentLinkedQueue<suspend () -> Unit>()
 
     override suspend fun tick() {
-        schedulesMutex.withLock {
-            schedules.forEach { it() }
-            schedules.clear()
+        while (true) {
+            val task = schedules.poll() ?: break
+
+            try {
+                task()
+            } catch (e: Exception) {
+                log.atWarning()
+                    .withCause(e)
+                    .log("Error while executing scheduled task")
+            }
         }
+
         tick0()
     }
 
     protected abstract suspend fun tick0()
 
-    suspend fun schedule(function: suspend () -> Unit) {
-        schedulesMutex.withLock {
-            schedules.add(function)
-        }
+    fun schedule(function: suspend () -> Unit) {
+        schedules.add(function)
     }
 }

surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/coroutine/impl/CoroutineManagerImpl.kt

@@ -1,16 +1,14 @@
 package dev.slne.surf.cloud.standalone.plugin.coroutine.impl
 
 import com.google.auto.service.AutoService
-import dev.slne.surf.surfapi.core.api.util.mutableObject2ObjectMapOf
-import dev.slne.surf.surfapi.core.api.util.synchronize
 import dev.slne.surf.cloud.api.server.plugin.StandalonePlugin
 import dev.slne.surf.cloud.api.server.plugin.coroutine.CoroutineManager
 import dev.slne.surf.cloud.api.server.plugin.coroutine.CoroutineSession
+import java.util.concurrent.ConcurrentHashMap
 
 @AutoService(CoroutineManager::class)
 class CoroutineManagerImpl : CoroutineManager {
-    private val items =
-        mutableObject2ObjectMapOf<StandalonePlugin, CoroutineSessionImpl>().synchronize()
+    private val items = ConcurrentHashMap<StandalonePlugin, CoroutineSessionImpl>()
 
     override fun getCoroutineSession(plugin: StandalonePlugin): CoroutineSession {
         val session = items[plugin]
@@ -20,9 +18,10 @@ class CoroutineManagerImpl : CoroutineManager {
     }
 
     override fun setupCoroutineSession(plugin: StandalonePlugin) {
-        check(plugin !in items) { "Coroutine session for plugin ${plugin.meta.name} is already initialized" }
-        items[plugin] = CoroutineSessionImpl(plugin)
-
+        items.compute(plugin) { _, value ->
+            check(value == null) { "Coroutine session for plugin ${plugin.meta.name} is already initialized" }
+            CoroutineSessionImpl(plugin)
+        }
     }
 
     override fun disable(plugin: StandalonePlugin) {

surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/entrypoint/classloader/ByteCodeModifyingURLClassloader.kt

@@ -1,7 +1,5 @@
 package dev.slne.surf.cloud.standalone.plugin.entrypoint.classloader
 
-import dev.slne.surf.surfapi.core.api.util.mutableObject2ObjectMapOf
-import dev.slne.surf.surfapi.core.api.util.synchronize
 import java.io.IOException
 import java.io.UncheckedIOException
 import java.net.JarURLConnection
@@ -10,6 +8,7 @@ import java.net.URL
 import java.net.URLClassLoader
 import java.security.CodeSigner
 import java.security.CodeSource
+import java.util.concurrent.ConcurrentHashMap
 import java.util.jar.Attributes
 import java.util.jar.Manifest
 
@@ -26,7 +25,7 @@ class ByteCodeModifyingURLClassloader(
         }
     }
 
-    private val manifestCache = mutableObject2ObjectMapOf<String, Any>().synchronize()
+    private val manifestCache = ConcurrentHashMap<String, Any>()
 
     override fun findClass(name: String): Class<*> {
         val path = name.replace('.', '/') + ".class"
@@ -43,7 +42,7 @@ class ByteCodeModifyingURLClassloader(
         val lastDot = name.lastIndexOf('.')
 
         if (lastDot != -1) {
-            val pkgName = name.substring(0, lastDot)
+            val pkgName = name.take(lastDot)
 
             // Check if package already loaded.
             val manifest = url.manifest()