diff options
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/hashmap.go | 9 | ||||
| -rw-r--r-- | src/runtime/stubs.go | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/runtime/hashmap.go b/src/runtime/hashmap.go index 87d0d26cfa..64ec84474e 100644 --- a/src/runtime/hashmap.go +++ b/src/runtime/hashmap.go @@ -64,8 +64,10 @@ const ( bucketCntBits = 3 bucketCnt = 1 << bucketCntBits - // Maximum average load of a bucket that triggers growth. - loadFactor = 6.5 + // Maximum average load of a bucket that triggers growth is 6.5. + // Represent as loadFactorNum/loadFactDen, to allow integer math. + loadFactorNum = 13 + loadFactorDen = 2 // Maximum key or value size to keep inline (instead of mallocing per element). // Must fit in a uint8. @@ -984,8 +986,7 @@ func hashGrow(t *maptype, h *hmap) { // overLoadFactor reports whether count items placed in 1<<B buckets is over loadFactor. func overLoadFactor(count int64, B uint8) bool { - // TODO: rewrite to use integer math and comparison? - return count >= bucketCnt && float32(count) >= loadFactor*float32((uint64(1)<<B)) + return count >= bucketCnt && uint64(count) >= loadFactorNum*((uint64(1)<<B)/loadFactorDen) } // tooManyOverflowBuckets reports whether noverflow buckets is too many for a map with 1<<B buckets. diff --git a/src/runtime/stubs.go b/src/runtime/stubs.go index ce9b67a0ee..7f504e684e 100644 --- a/src/runtime/stubs.go +++ b/src/runtime/stubs.go @@ -91,7 +91,7 @@ func reflect_memmove(to, from unsafe.Pointer, n uintptr) { } // exported value for testing -var hashLoad = loadFactor +var hashLoad = float32(loadFactorNum) / float32(loadFactorDen) //go:nosplit func fastrand() uint32 { |