DBot/kommons
DBot/kommons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove locking in mailbox executor service

Browse Source
This commit is contained in:
DBotThePony 2024-02-04 20:20:03 +07:00
parent a1f7eaeee8
commit abf91f445e
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -4,7 +4,7 @@ kotlin.code.style=official
specifyKotlinAsDependency=false specifyKotlinAsDependency=false
projectGroup=ru.dbotthepony.kommons projectGroup=ru.dbotthepony.kommons
projectVersion=1.7.7 projectVersion=1.7.8
guavaDepVersion=33.0.0 guavaDepVersion=33.0.0
gsonDepVersion=2.8.9 gsonDepVersion=2.8.9

15
src/main/kotlin/ru/dbotthepony/kommons/util/MailboxExecutorService.kt
View File

@ -51,7 +51,6 @@ class MailboxExecutorService(thread: Thread = Thread.currentThread()) : Schedule
private val timers = LinkedList<Timer<*>>() private val timers = LinkedList<Timer<*>>()
private val repeatableTimers = LinkedList<RepeatableTimer>() private val repeatableTimers = LinkedList<RepeatableTimer>()
private val executionLock = ReentrantLock()
@Volatile @Volatile
private var isShutdown = false private var isShutdown = false
@ -138,16 +137,18 @@ class MailboxExecutorService(thread: Thread = Thread.currentThread()) : Schedule
if (!isTerminated) { if (!isTerminated) {
isTerminated = true isTerminated = true
executionLock.withLock { futureQueue.forEach {
it.cancel(false)
}
futureQueue.clear()
timers.clear() timers.clear()
repeatableTimers.clear() repeatableTimers.clear()
}
return return
} }
} }
executionLock.withLock {
var next = futureQueue.poll() var next = futureQueue.poll()
while (next != null) { while (next != null) {
@ -193,7 +194,6 @@ class MailboxExecutorService(thread: Thread = Thread.currentThread()) : Schedule
executed.forEach { repeatableTimers.enqueue(it) } executed.forEach { repeatableTimers.enqueue(it) }
} }
} }
}
override fun execute(command: Runnable) { override fun execute(command: Runnable) {
if (isShutdown) throw RejectedExecutionException("This mailbox is shutting down") if (isShutdown) throw RejectedExecutionException("This mailbox is shutting down")
@ -210,13 +210,13 @@ class MailboxExecutorService(thread: Thread = Thread.currentThread()) : Schedule
isShutdown = true isShutdown = true
} }
override fun shutdownNow(): MutableList<Runnable> { override fun shutdownNow(): List<Runnable> {
if (isTerminated) return listOf()
isShutdown = true isShutdown = true
isTerminated = true isTerminated = true
val result = ArrayList<Runnable>() val result = ArrayList<Runnable>()
executionLock.withLock {
futureQueue.forEach { futureQueue.forEach {
it.cancel(false) it.cancel(false)
result.add(it) result.add(it)
@ -229,7 +229,6 @@ class MailboxExecutorService(thread: Thread = Thread.currentThread()) : Schedule
timers.clear() timers.clear()
repeatableTimers.clear() repeatableTimers.clear()
}
return result return result
} }