fix: Avoid slowing down mutex when close

Rushyverse · Dec 18, 2023 · 7828409 · 7828409
1 parent 9bad411
commit 7828409
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 30 deletions.
diff --git a/src/main/kotlin/com/github/rushyverse/api/gui/LocaleGUI.kt b/src/main/kotlin/com/github/rushyverse/api/gui/LocaleGUI.kt
@@ -9,7 +9,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.job
 import kotlinx.coroutines.plus
-import kotlinx.coroutines.sync.withLock
 import org.bukkit.event.inventory.InventoryCloseEvent
 import org.bukkit.plugin.Plugin
 
@@ -39,15 +38,9 @@ public abstract class LocaleGUI(
     }
 
     override suspend fun close(client: Client, closeInventory: Boolean): Boolean {
-        if (!closeInventory) {
-            return false
-        }
-
-        return mutex.withLock {
-            if (unsafeContains(client)) {
-                client.player?.closeInventory(InventoryCloseEvent.Reason.PLUGIN)
-                true
-            } else false
-        }
+        return if (closeInventory && contains(client)) {
+            client.player?.closeInventory(InventoryCloseEvent.Reason.PLUGIN)
+            true
+        } else false
     }
 }
diff --git a/src/main/kotlin/com/github/rushyverse/api/gui/PlayerGUI.kt b/src/main/kotlin/com/github/rushyverse/api/gui/PlayerGUI.kt
@@ -52,13 +52,16 @@ public abstract class PlayerGUI(
     }
 
     override suspend fun close(client: Client, closeInventory: Boolean): Boolean {
-        return mutex.withLock { inventories.remove(client) }?.run {
-            job.cancel(GUIClosedForClientException(client))
-            job.join()
-            if (closeInventory) {
-                inventory.close()
-            }
-            true
-        } == true
+        val (inventory, job) = mutex.withLock { inventories.remove(client) } ?: return false
+
+        job.cancel(GUIClosedForClientException(client))
+        job.join()
+
+        if (closeInventory) {
+            // Call out of the lock to avoid slowing down the mutex.
+            inventory.close()
+        }
+
+        return true
     }
 }
diff --git a/src/main/kotlin/com/github/rushyverse/api/gui/SingleGUI.kt b/src/main/kotlin/com/github/rushyverse/api/gui/SingleGUI.kt
@@ -7,7 +7,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.job
 import kotlinx.coroutines.plus
-import kotlinx.coroutines.sync.withLock
 import org.bukkit.event.inventory.InventoryCloseEvent
 import org.bukkit.plugin.Plugin
 
@@ -40,16 +39,10 @@ public abstract class SingleGUI(
     }
 
     override suspend fun close(client: Client, closeInventory: Boolean): Boolean {
-        if (!closeInventory) {
-            return false
-        }
-
-        return mutex.withLock {
-            if (unsafeContains(client)) {
-                client.player?.closeInventory(InventoryCloseEvent.Reason.PLUGIN)
-                true
-            } else false
-        }
+        return if (closeInventory && contains(client)) {
+            client.player?.closeInventory(InventoryCloseEvent.Reason.PLUGIN)
+            true
+        } else false
     }
 
     override suspend fun getKey(client: Client): Any {