Commit 5ecdf6bfb388c87c3a97eb6e341120521451c5cb - golang-github-vbauerster-mpb

initialize main ticker inside serve goroutine Vladimir Bauer 7 years ago

4 changed file(s) with 25 addition(s) and 19 deletion(s). Raw diff Collapse all Expand all

-2

options.go less more

-2

progress.go less more

+17

-13

progress_posix.go less more

9	9	)
10	10
11	11	func (p Progress) serve(s pState) {
	12
	13	var resumeTimer *time.Timer
	14	var resumeEvent <-chan time.Time
	15	winchIdleDur := s.rr * 2
12	16	winch := make(chan os.Signal, 2)
13	17	signal.Notify(winch, syscall.SIGWINCH)
14	18
15		var timer *time.Timer
16		var tickerResumer <-chan time.Time
17		resumeDelay := s.rr * 2
	19	ticker := time.NewTicker(s.rr)
	20	refreshCh := ticker.C
18	21
19	22	for {
20	23	select {
21	24	case op := <-p.operateState:
22	25	op(s)
23		case <-s.ticker.C:
	26	case <-refreshCh:
24	27	if s.zeroWait {
25		s.ticker.Stop()
	28	ticker.Stop()
26	29	signal.Stop(winch)
27	30	if s.shutdownNotifier != nil {
28	31	close(s.shutdownNotifier)

41	44	tw = s.width
42	45	}
43	46	s.render(tw - tw/8)
44		if timer != nil && timer.Reset(resumeDelay) {
	47	if resumeTimer != nil && resumeTimer.Reset(winchIdleDur) {
45	48	break
46	49	}
47		s.ticker.Stop()
48		timer = time.NewTimer(resumeDelay)
49		tickerResumer = timer.C
50		case <-tickerResumer:
51		s.ticker = time.NewTicker(s.rr)
52		tickerResumer = nil
53		timer = nil
	50	ticker.Stop()
	51	resumeTimer = time.NewTimer(winchIdleDur)
	52	resumeEvent = resumeTimer.C
	53	case <-resumeEvent:
	54	ticker = time.NewTicker(s.rr)
	55	refreshCh = ticker.C
	56	resumeEvent = nil
	57	resumeTimer = nil
54	58	}
55	59	}
56	60	}

-2

progress_windows.go less more

1	1
2	2	package mpb
3	3
	4	import "time"
	5
4	6	func (p Progress) serve(s pState) {
	7
	8	ticker := time.NewTicker(s.rr)
	9	refreshCh := ticker.C
	10
5	11	for {
6	12	select {
7	13	case op := <-p.operateState:
8	14	op(s)
9		case <-s.ticker.C:
	15	case <-refreshCh:
10	16	if s.zeroWait {
11		s.ticker.Stop()
	17	ticker.Stop()
12	18	if s.shutdownNotifier != nil {
13	19	close(s.shutdownNotifier)
14	20	}