diff options
| -rw-r--r-- | src/sync/map_bench_test.go | 4 | ||||
| -rw-r--r-- | src/sync/map_reference_test.go | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/sync/map_bench_test.go b/src/sync/map_bench_test.go index a5590a5ddc..e6a8badddb 100644 --- a/src/sync/map_bench_test.go +++ b/src/sync/map_bench_test.go @@ -203,12 +203,10 @@ func BenchmarkAdversarialDelete(b *testing.B) { m.Load(i) if i%mapSize == 0 { - var key int m.Range(func(k, _ interface{}) bool { - key = k.(int) + m.Delete(k) return false }) - m.Delete(key) m.Store(i, i) } } diff --git a/src/sync/map_reference_test.go b/src/sync/map_reference_test.go index b21018c47f..9f27b07c32 100644 --- a/src/sync/map_reference_test.go +++ b/src/sync/map_reference_test.go @@ -64,8 +64,17 @@ func (m *RWMutexMap) Delete(key interface{}) { func (m *RWMutexMap) Range(f func(key, value interface{}) (shouldContinue bool)) { m.mu.RLock() - defer m.mu.RUnlock() - for k, v := range m.dirty { + keys := make([]interface{}, 0, len(m.dirty)) + for k := range m.dirty { + keys = append(keys, k) + } + m.mu.RUnlock() + + for _, k := range keys { + v, ok := m.Load(k) + if !ok { + continue + } if !f(k, v) { break } |