DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Fix ref hash strategy

Browse Source
This commit is contained in:
DBotThePony 2023-08-19 17:38:19 +07:00
parent 159c82cadd
commit 9d79e52c43
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ReferenceHashStrategy.kt
View File

@ -4,42 +4,15 @@ import it.unimi.dsi.fastutil.Hash
import java.lang.ref.Reference import java.lang.ref.Reference
object ReferenceHashStrategy : Hash.Strategy<Any?> { object ReferenceHashStrategy : Hash.Strategy<Any?> {
@Suppress("UNCHECKED_CAST")
override fun equals(a: Any?, b: Any?): Boolean { override fun equals(a: Any?, b: Any?): Boolean {
if (a === b) return true if (a === b) return true
if (a == null || b == null) return false
if (a is Reference<*>) { if (a is Reference<*>) {
if (a.refersTo(null) || b == null) return false if (b is Reference<*>) return a.get() == b.get()
return a.get() == b
if (b is Reference<*>) {
if (b.refersTo(null)) return false
return (b as Reference<Any>).refersTo(a.get() ?: return false)
} else {
return (a as Reference<Any>).refersTo(b)
}
} else if (b is Reference<*>) { } else if (b is Reference<*>) {
if (b.refersTo(null) || a == null) return false return b.get() == a
return (b as Reference<Any>).refersTo(a)
}
return a == b
}
override fun hashCode(o: Any?): Int {
return o.hashCode()
}
}
object StrictReferenceHashStrategy : Hash.Strategy<Any?> {
@Suppress("UNCHECKED_CAST")
override fun equals(a: Any?, b: Any?): Boolean {
if (a === b) return true
if (a is Reference<*>) {
if (b is Reference<*>) return false
return b != null && (a as Reference<Any>).refersTo(b)
} else if (b is Reference<*>) {
return a != null && (b as Reference<Any>).refersTo(a)
} else { } else {
return a == b return a == b
} }

2
src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/WeakHashSet.kt
View File

@ -8,7 +8,7 @@ import java.lang.ref.ReferenceQueue
class WeakHashSet<E : Any>(initialCapacity: Int = 16, loadFactor: Float = 0.75f, linked: Boolean = false) : MutableSet<E> { class WeakHashSet<E : Any>(initialCapacity: Int = 16, loadFactor: Float = 0.75f, linked: Boolean = false) : MutableSet<E> {
private val queue = ReferenceQueue<E>() private val queue = ReferenceQueue<E>()
private val backing: ObjectSet<Any> = if (linked) ObjectLinkedOpenCustomHashSet(initialCapacity, loadFactor, StrictReferenceHashStrategy) else ObjectOpenCustomHashSet(initialCapacity, loadFactor, StrictReferenceHashStrategy) private val backing: ObjectSet<Any> = if (linked) ObjectLinkedOpenCustomHashSet(initialCapacity, loadFactor, ReferenceHashStrategy) else ObjectOpenCustomHashSet(initialCapacity, loadFactor, ReferenceHashStrategy)
private fun purge() { private fun purge() {
var next = queue.poll() var next = queue.poll()