Merge pull request #17425 from containers/dependabot/go_modules/github.com/vbauerster/mpb/v8-8.1.6

build(deps): bump github.com/vbauerster/mpb/v8 from 8.1.4 to 8.1.6

go.mod

@@ -57,7 +57,7 @@ require (
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
 	github.com/uber/jaeger-client-go v2.30.0+incompatible
 	github.com/ulikunitz/xz v0.5.11
-	github.com/vbauerster/mpb/v8 v8.1.4
+	github.com/vbauerster/mpb/v8 v8.1.6
 	github.com/vishvananda/netlink v1.2.1-beta.2
 	go.etcd.io/bbolt v1.3.7
 	golang.org/x/net v0.5.0

go.sum

@@ -1053,8 +1053,8 @@ github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX
 github.com/urfave/cli v1.22.9/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/vbatts/tar-split v0.11.2 h1:Via6XqJr0hceW4wff3QRzD5gAk/tatMw/4ZA7cTlIME=
 github.com/vbatts/tar-split v0.11.2/go.mod h1:vV3ZuO2yWSVsz+pfFzDG/upWH1JhjOiEaWq6kXyQ3VI=
-github.com/vbauerster/mpb/v8 v8.1.4 h1:MOcLTIbbAA892wVjRiuFHa1nRlNvifQMDVh12Bq/xIs=
-github.com/vbauerster/mpb/v8 v8.1.4/go.mod h1:2fRME8lCLU9gwJwghZb1bO9A3Plc8KPeQ/ayGj+Ek4I=
+github.com/vbauerster/mpb/v8 v8.1.6 h1:EswHDkAsy4OQ7QBAmU1MUPz4vHzl6KlINjlh7vJoxvY=
+github.com/vbauerster/mpb/v8 v8.1.6/go.mod h1:O9/Wl8X9dUbR63tZ41MLIAxrtNfwlpwUhGkeYugUPW8=
 github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=

vendor/github.com/vbauerster/mpb/v8/decor/percentage.go

@@ -23,7 +23,7 @@ func (s percentageType) Format(st fmt.State, verb rune) {
 		}
 	}
 
-	p := bytePool.Get().(*[]byte)
+	p := bytesPool.Get().(*[]byte)
 	b := strconv.AppendFloat(*p, float64(s), 'f', prec, 64)
 	if st.Flag(' ') {
 		b = append(b, ' ', '%')
@@ -34,7 +34,7 @@ func (s percentageType) Format(st fmt.State, verb rune) {
 	if err != nil {
 		panic(err)
 	}
-	bytePool.Put(p)
+	bytesPool.Put(p)
 }
 
 // Percentage returns percentage decorator. It's a wrapper of NewPercentage.

vendor/github.com/vbauerster/mpb/v8/decor/pool.go

@@ -2,9 +2,9 @@ package decor
 
 import "sync"
 
-var bytePool = sync.Pool{
+var bytesPool = sync.Pool{
 	New: func() interface{} {
-		b := make([]byte, 0, 16)
+		b := make([]byte, 0, 32)
 		return &b
 	},
 }

vendor/github.com/vbauerster/mpb/v8/decor/size_type.go

@@ -49,7 +49,7 @@ func (self SizeB1024) Format(st fmt.State, verb rune) {
 		unit = _iTiB
 	}
 
-	p := bytePool.Get().(*[]byte)
+	p := bytesPool.Get().(*[]byte)
 	b := strconv.AppendFloat(*p, float64(self)/float64(unit), 'f', prec, 64)
 	if st.Flag(' ') {
 		b = append(b, ' ')
@@ -59,7 +59,7 @@ func (self SizeB1024) Format(st fmt.State, verb rune) {
 	if err != nil {
 		panic(err)
 	}
-	bytePool.Put(p)
+	bytesPool.Put(p)
 }
 
 const (
@@ -103,7 +103,7 @@ func (self SizeB1000) Format(st fmt.State, verb rune) {
 		unit = _TB
 	}
 
-	p := bytePool.Get().(*[]byte)
+	p := bytesPool.Get().(*[]byte)
 	b := strconv.AppendFloat(*p, float64(self)/float64(unit), 'f', prec, 64)
 	if st.Flag(' ') {
 		b = append(b, ' ')
@@ -113,5 +113,5 @@ func (self SizeB1000) Format(st fmt.State, verb rune) {
 	if err != nil {
 		panic(err)
 	}
-	bytePool.Put(p)
+	bytesPool.Put(p)
 }

vendor/github.com/vbauerster/mpb/v8/progress.go

@@ -39,10 +39,7 @@ type pState struct {
 	heapUpdated bool
 	pMatrix     map[int][]chan int
 	aMatrix     map[int][]chan int
-
-	// for reuse purposes
-	rows []io.Reader
-	pool []*Bar
+	rows        []io.Reader
 
 	// following are provided/overrided by user
 	refreshRate        time.Duration
@@ -72,8 +69,7 @@ func New(options ...ContainerOption) *Progress {
 // method has been called.
 func NewWithContext(ctx context.Context, options ...ContainerOption) *Progress {
 	s := &pState{
-		rows:          make([]io.Reader, 0, 64),
-		pool:          make([]*Bar, 0, 64),
+		rows:          make([]io.Reader, 32),
 		refreshRate:   defaultRefreshRate,
 		popPriority:   math.MinInt32,
 		manualRefresh: make(chan interface{}),
@@ -275,9 +271,6 @@ func (p *Progress) serve(s *pState, cw *cwriter.Writer) {
 	defer close(p.shutdown)
 
 	render := func() error {
-		if s.bHeap.Len() == 0 {
-			return nil
-		}
 		return s.render(cw)
 	}
 
@@ -336,6 +329,8 @@ func (s *pState) render(cw *cwriter.Writer) error {
 
 func (s *pState) flush(wg *sync.WaitGroup, cw *cwriter.Writer, height int) error {
 	var popCount int
+	pool := make([]*Bar, 0, s.bHeap.Len())
+	s.rows = s.rows[:0]
 
 	for s.bHeap.Len() > 0 {
 		b := heap.Pop(&s.bHeap).(*Bar)
@@ -362,7 +357,7 @@ func (s *pState) flush(wg *sync.WaitGroup, cw *cwriter.Writer, height int) error
 			if qb, ok := s.queueBars[b]; ok {
 				delete(s.queueBars, b)
 				qb.priority = b.priority
-				s.pool = append(s.pool, qb)
+				pool = append(pool, qb)
 				s.heapUpdated = true
 				continue
 			}
@@ -383,25 +378,15 @@ func (s *pState) flush(wg *sync.WaitGroup, cw *cwriter.Writer, height int) error
 				continue
 			}
 		}
-		s.pool = append(s.pool, b)
+		pool = append(pool, b)
 	}
 
-	switch len(s.pool) {
-	case 0:
-		if s.heapUpdated {
-			s.updateSyncMatrix()
-			s.heapUpdated = false
-		}
-	case 1:
-		heap.Push(&s.bHeap, s.pool[0])
-		s.pool = s.pool[:0]
-	default:
+	if len(pool) != 0 {
 		wg.Add(1)
 		go func() {
-			for _, b := range s.pool {
+			for _, b := range pool {
 				heap.Push(&s.bHeap, b)
 			}
-			s.pool = s.pool[:0]
 			wg.Done()
 		}()
 	}
@@ -414,7 +399,6 @@ func (s *pState) flush(wg *sync.WaitGroup, cw *cwriter.Writer, height int) error
 	}
 
 	err := cw.Flush(len(s.rows) - popCount)
-	s.rows = s.rows[:0]
 	return err
 }
 

vendor/modules.txt

@@ -864,7 +864,7 @@ github.com/ulikunitz/xz/lzma
 github.com/vbatts/tar-split/archive/tar
 github.com/vbatts/tar-split/tar/asm
 github.com/vbatts/tar-split/tar/storage
-# github.com/vbauerster/mpb/v8 v8.1.4
+# github.com/vbauerster/mpb/v8 v8.1.6
 ## explicit; go 1.17
 github.com/vbauerster/mpb/v8
 github.com/vbauerster/mpb/v8/cwriter