1
0
mirror of https://github.com/golang/go synced 2024-11-12 09:30:25 -07:00

container/ring: Replace Iter() with Do().

Faster in most cases, and not prone to memory leaks. Named "Do" to match with similarly named method on Vector.

R=gri
CC=golang-dev
https://golang.org/cl/4134046
This commit is contained in:
Kyle Consalus 2011-02-08 20:07:05 -08:00 committed by Robert Griesemer
parent 5e83d40904
commit 3629d72328
2 changed files with 10 additions and 23 deletions

View File

@ -138,16 +138,13 @@ func (r *Ring) Len() int {
}
func (r *Ring) Iter() <-chan interface{} {
c := make(chan interface{})
go func() {
if r != nil {
c <- r.Value
for p := r.Next(); p != r; p = p.next {
c <- p.Value
}
// Do calls function f on each element of the ring, in forward order.
// The behavior of Do is undefined if f changes *r.
func (r *Ring) Do(f func(interface{})) {
if r != nil {
f(r.Value)
for p := r.Next(); p != r; p = p.next {
f(p.Value)
}
close(c)
}()
return c
}
}

View File

@ -35,12 +35,12 @@ func verify(t *testing.T, r *Ring, N int, sum int) {
// iteration
n = 0
s := 0
for p := range r.Iter() {
r.Do(func(p interface{}) {
n++
if p != nil {
s += p.(int)
}
}
})
if n != N {
t.Errorf("number of forward iterations == %d; expected %d", n, N)
}
@ -128,16 +128,6 @@ func makeN(n int) *Ring {
return r
}
func sum(r *Ring) int {
s := 0
for p := range r.Iter() {
s += p.(int)
}
return s
}
func sumN(n int) int { return (n*n + n) / 2 }