[release/1.4.3] miner: fixed pending state by not shutting down update loop

obscuren · obscuren · commit 6826b2040f0d · 2016-05-10T13:46:03.000+02:00
(cherry picked from commit a824c3f)
diff --git a/miner/worker.go b/miner/worker.go
@@ -145,7 +145,6 @@ func newWorker(config *core.ChainConfig, coinbase common.Address, eth core.Backe
 		fullValidation: false,
 	}
 	worker.events = worker.mux.Subscribe(core.ChainHeadEvent{}, core.ChainSideEvent{}, core.TxPreEvent{})
-	worker.wg.Add(1)
 	go worker.update()
 
 	go worker.wait()
@@ -188,8 +187,6 @@ func (self *worker) start() {
 }
 
 func (self *worker) stop() {
-	// Quit update.
-	self.events.Unsubscribe()
 	self.wg.Wait()
 
 	self.mu.Lock()
@@ -224,7 +221,6 @@ func (self *worker) unregister(agent Agent) {
 }
 
 func (self *worker) update() {
-	defer self.wg.Done()
 	for event := range self.events.Chan() {
 		// A real event arrived, process interesting content
 		switch ev := event.Data.(type) {

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,6 @@ func newWorker(config *core.ChainConfig, coinbase common.Address, eth core.Backe`
`145`	`145`	`fullValidation: false,`
`146`	`146`	`}`
`147`	`147`	`worker.events = worker.mux.Subscribe(core.ChainHeadEvent{}, core.ChainSideEvent{}, core.TxPreEvent{})`
`148`		`- worker.wg.Add(1)`
`149`	`148`	`go worker.update()`
`150`	`149`
`151`	`150`	`go worker.wait()`
`@@ -188,8 +187,6 @@ func (self *worker) start() {`
`188`	`187`	`}`
`189`	`188`
`190`	`189`	`func (self *worker) stop() {`
`191`		`- // Quit update.`
`192`		`- self.events.Unsubscribe()`
`193`	`190`	`self.wg.Wait()`
`194`	`191`
`195`	`192`	`self.mu.Lock()`
`@@ -224,7 +221,6 @@ func (self *worker) unregister(agent Agent) {`
`224`	`221`	`}`
`225`	`222`
`226`	`223`	`func (self *worker) update() {`
`227`		`- defer self.wg.Done()`
`228`	`224`	`for event := range self.events.Chan() {`
`229`	`225`	`// A real event arrived, process interesting content`
`230`	`226`	`switch ev := event.Data.(type) {`