Codebase list golang-github-vbauerster-mpb / 3e0db8b
oncmp msg with bar drop Vladimir Bauer 7 years ago
2 changed file(s) with 46 addition(s) and 28 deletion(s). Raw diff Collapse all Expand all
+7
-7
bar.go less more
320320 frame = io.MultiReader(frame, s.bufE)
321321 }
322322
323 b.toDrop = s.dropOnComplete
323 // b.toDrop = s.dropOnComplete
324324 b.toShutdown = s.toComplete && !s.completeFlushed
325325 s.completeFlushed = s.toComplete
326326
410410 }
411411 }
412412
413 func (b *Bar) dropOnComplete() {
414 select {
415 case b.operateState <- func(s *bState) { s.dropOnComplete = true }:
416 case <-b.done:
417 }
418 }
413 // func (b *Bar) dropOnComplete() {
414 // select {
415 // case b.operateState <- func(s *bState) { s.dropOnComplete = true }:
416 // case <-b.done:
417 // }
418 // }
419419
420420 func newStatistics(s *bState) *decor.Statistics {
421421 return &decor.Statistics{
+39
-21
progress.go less more
3737 heapUpdated bool
3838 pMatrix map[int][]chan int
3939 aMatrix map[int][]chan int
40 barShutdownQueue []func()
40 barShutdownQueue []*Bar
4141
4242 // following are provided/overrided by user
4343 idCount int
155155 if b.index < 0 {
156156 return
157157 }
158 s.heapUpdated = heap.Remove(&s.bHeap, b.index) != nil
158 heap.Remove(&s.bHeap, b.index)
159 s.heapUpdated = true
159160 }:
160161 case <-p.done:
161162 }
253254 }
254255
255256 func (s *pState) flush(cw *cwriter.Writer) error {
257 var rpop bool
256258 var lineCount int
257 for s.bHeap.Len() > 0 {
259 hlen := s.bHeap.Len()
260 tmp := make([]*Bar, hlen)
261 for i := 0; i < hlen; i++ {
258262 bar := heap.Pop(&s.bHeap).(*Bar)
259263 defer func() {
260264 if bar.toShutdown {
261265 // shutdown at next flush, in other words decrement underlying WaitGroup
262266 // only after the bar with completed state has been flushed. this
263267 // ensures no bar ends up with less than 100% rendered.
264 s.barShutdownQueue = append(s.barShutdownQueue, bar.cancel)
265 if parkedBar := s.parkedBars[bar]; parkedBar != nil {
266 heap.Push(&s.bHeap, parkedBar)
267 s.heapUpdated = true
268 delete(s.parkedBars, bar)
269 }
270 if bar.toDrop {
271 s.heapUpdated = true
272 return
273 }
274 }
275 heap.Push(&s.bHeap, bar)
268 s.barShutdownQueue = append(s.barShutdownQueue, bar)
269 // if parkedBar := s.parkedBars[bar]; parkedBar != nil {
270 // heap.Push(&s.bHeap, parkedBar)
271 // s.heapUpdated = true
272 // delete(s.parkedBars, bar)
273 // }
274 // if bar.toDrop {
275 // s.heapUpdated = true
276 // return
277 // }
278 // bar.priority = 0
279 }
276280 }()
277281 cw.ReadFrom(<-bar.frameCh)
278282 lineCount += bar.extendedLines + 1
279 }
280
281 for i := len(s.barShutdownQueue) - 1; i >= 0; i-- {
282 s.barShutdownQueue[i]()
283 s.barShutdownQueue = s.barShutdownQueue[:i]
284 }
283 tmp[i] = bar
284 }
285
286 for _, b := range tmp {
287 heap.Push(&s.bHeap, b)
288 }
289
290 for _, b := range s.barShutdownQueue {
291 if parkedBar := s.parkedBars[b]; parkedBar != nil {
292 heap.Remove(&s.bHeap, b.index)
293 heap.Push(&s.bHeap, parkedBar)
294 delete(s.parkedBars, b)
295 s.heapUpdated = true
296 } else if b.toDrop {
297 heap.Remove(&s.bHeap, b.index)
298 s.heapUpdated = true
299 }
300 b.cancel()
301 }
302 s.barShutdownQueue = s.barShutdownQueue[0:0]
285303
286304 return cw.Flush(lineCount)
287305 }