Merge pull request #654 from stevvooe/simplify-stopch

pkg/store: use a sync.Once to synchronize channel close

pkg/store/util.go

@@ -20,28 +20,20 @@ import "sync"
 
 // StopCh is used to propagate the stop information of a container.
 type StopCh struct {
-	mu     sync.Mutex
+	ch   chan struct{}
-	ch     chan struct{}
+	once sync.Once
-	closed bool
 }
 
 // NewStopCh creates a stop channel. The channel is open by default.
 func NewStopCh() *StopCh {
-	return &StopCh{
+	return &StopCh{ch: make(chan struct{})}
-		ch:     make(chan struct{}),
-		closed: false,
-	}
 }
 
 // Stop close stopCh of the container.
 func (s *StopCh) Stop() {
-	s.mu.Lock()
+	s.once.Do(func() {
-	defer s.mu.Unlock()
+		close(s.ch)
-	if s.closed {
+	})
-		return
-	}
-	close(s.ch)
-	s.closed = true
 }
 
 // Stopped return the stopCh of the container as a readonly channel.