Commit e0b34e7b authored by Josh Bleecher Snyder's avatar Josh Bleecher Snyder

runtime: split advanceEvacuationMark from evacuate

Minor refactoring. This is a step towards specializing evacuate
for mapfast key types.

Change-Id: Icffe2759b7d38e5c008d03941918d5a912ce62f6
Reviewed-on: https://go-review.googlesource.com/56933
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: default avatarKeith Randall <khr@golang.org>
parent 43d4c9f4
...@@ -1138,8 +1138,12 @@ func evacuate(t *maptype, h *hmap, oldbucket uintptr) { ...@@ -1138,8 +1138,12 @@ func evacuate(t *maptype, h *hmap, oldbucket uintptr) {
} }
} }
// Advance evacuation mark
if oldbucket == h.nevacuate { if oldbucket == h.nevacuate {
advanceEvacuationMark(h, t, newbit)
}
}
func advanceEvacuationMark(h *hmap, t *maptype, newbit uintptr) {
h.nevacuate++ h.nevacuate++
// Experiments suggest that 1024 is overkill by at least an order of magnitude. // Experiments suggest that 1024 is overkill by at least an order of magnitude.
// Put it in there as a safeguard anyway, to ensure O(1) behavior. // Put it in there as a safeguard anyway, to ensure O(1) behavior.
...@@ -1161,7 +1165,6 @@ func evacuate(t *maptype, h *hmap, oldbucket uintptr) { ...@@ -1161,7 +1165,6 @@ func evacuate(t *maptype, h *hmap, oldbucket uintptr) {
} }
h.flags &^= sameSizeGrow h.flags &^= sameSizeGrow
} }
}
} }
func ismapkey(t *_type) bool { func ismapkey(t *_type) bool {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment