github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-09 18:00:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

LockFreeLinkedList: fix peekFirst

Browse Source
This commit is contained in:
Him188 2020-02-26 13:06:18 +08:00
parent be63ec48fa
commit dc02278c11
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/LockFreeLinkedList.kt
View File

@ -111,9 +111,13 @@ open class LockFreeLinkedList<E> {
} }
} }
open fun peekFirst(): E = head.nextNode.letValueIfValid { return it } ?: throw NoSuchElementException() open fun peekFirst(): E {
return head
open fun peekLast(): E = head.iterateBeforeFirst { it === tail }.letValueIfValid { return it } ?: throw NoSuchElementException() .iterateBeforeFirst { it === tail }
.takeUnless { it.isTail() }
?.nodeValue
?: throw NoSuchElementException()
}
open fun removeLast(): E { open fun removeLast(): E {
while (true) { while (true) {
@ -770,11 +774,7 @@ open class LockFreeLinkedListNode<E>(
internal val nextNodeRef: AtomicRef<LockFreeLinkedListNode<E>> = atomic(nextNode ?: this) internal val nextNodeRef: AtomicRef<LockFreeLinkedListNode<E>> = atomic(nextNode ?: this)
inline fun <R> letValueIfValid(block: (E) -> R): R? { inline fun <R> letValueIfValid(block: (E) -> R): R? {
if (!this.isValidElementNode()) { return this.takeIf { isValidElementNode() }?.nodeValue?.let(block)
return null
}
val value = this.nodeValue
return if (value !== null) block(value) else null
} }
/** /**