mirrors/packwiz-installer
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz-installer.git synced 2025-05-06 12:36:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Optimise memory usage while computing Murmur2

Browse Source
This commit is contained in:
comp500 2019-12-23 16:31:36 +00:00
parent 432bb4e25f
commit a0da889a02
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/kotlin/link/infra/packwiz/installer/metadata/hash/Murmur2Hasher.kt
View File

@ -10,7 +10,7 @@ class Murmur2Hasher : IHasher {
val tempBuffer = Buffer() val tempBuffer = Buffer()
override val hash: Hash by lazy(LazyThreadSafetyMode.NONE) { override val hash: Hash by lazy(LazyThreadSafetyMode.NONE) {
val data = computeNormalizedArray(internalBuffer.readByteArray()) val data = internalBuffer.readByteArray()
Murmur2Hash(Murmur2Lib.hash32(data, data.size, 1)) Murmur2Hash(Murmur2Lib.hash32(data, data.size, 1))
} }
@ -19,27 +19,42 @@ class Murmur2Hasher : IHasher {
val out = delegate.read(tempBuffer, byteCount) val out = delegate.read(tempBuffer, byteCount)
if (out > -1) { if (out > -1) {
sink.write(tempBuffer.clone(), out) sink.write(tempBuffer.clone(), out)
internalBuffer.write(tempBuffer, out) computeNormalizedBufferFaster(tempBuffer, internalBuffer)
} }
return out return out
} }
// Credit to https://github.com/modmuss50/CAV2/blob/master/murmur.go // Credit to https://github.com/modmuss50/CAV2/blob/master/murmur.go
private fun computeNormalizedArray(input: ByteArray): ByteArray { // private fun computeNormalizedArray(input: ByteArray): ByteArray {
val output = ByteArray(input.size) // val output = ByteArray(input.size)
// var index = 0
// for (b in input) {
// when (b) {
// 9.toByte(), 10.toByte(), 13.toByte(), 32.toByte() -> {}
// else -> {
// output[index] = b
// index++
// }
// }
// }
// val outputTrimmed = ByteArray(index)
// System.arraycopy(output, 0, outputTrimmed, 0, index)
// return outputTrimmed
// }
private fun computeNormalizedBufferFaster(input: Buffer, output: Buffer) {
var index = 0 var index = 0
for (b in input) { val arr = input.readByteArray()
for (b in arr) {
when (b) { when (b) {
9.toByte(), 10.toByte(), 13.toByte(), 32.toByte() -> {} 9.toByte(), 10.toByte(), 13.toByte(), 32.toByte() -> {}
else -> { else -> {
output[index] = b arr[index] = b
index++ index++
} }
} }
} }
val outputTrimmed = ByteArray(index) output.write(arr, 0, index)
System.arraycopy(output, 0, outputTrimmed, 0, index)
return outputTrimmed
} }
} }