aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-04-30 23:50:23 +0800
committerobscuren <geffobscura@gmail.com>2015-04-30 23:50:47 +0800
commit15873fafc02e444c38de722277ab2461cb9b82c5 (patch)
tree8d9f155055a2fd8b1f1ebcd1e2ba9777a84fc786 /core
parente4dba36892477f3ef614dd4e4f1234ae4a4e26d0 (diff)
downloaddexon-15873fafc02e444c38de722277ab2461cb9b82c5.tar
dexon-15873fafc02e444c38de722277ab2461cb9b82c5.tar.gz
dexon-15873fafc02e444c38de722277ab2461cb9b82c5.tar.bz2
dexon-15873fafc02e444c38de722277ab2461cb9b82c5.tar.lz
dexon-15873fafc02e444c38de722277ab2461cb9b82c5.tar.xz
dexon-15873fafc02e444c38de722277ab2461cb9b82c5.tar.zst
dexon-15873fafc02e444c38de722277ab2461cb9b82c5.zip
core: added a wait group to chain manager for graceful shutdown
Diffstat (limited to 'core')
-rw-r--r--core/chain_manager.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/chain_manager.go b/core/chain_manager.go
index 9f62d3b47..80fd6cd71 100644
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@@ -93,6 +93,7 @@ type ChainManager struct {
futureBlocks *BlockCache
quit chan struct{}
+ wg sync.WaitGroup
}
func NewChainManager(blockDb, stateDb common.Database, mux *event.TypeMux) *ChainManager {
@@ -482,6 +483,10 @@ func (self *ChainManager) CalcTotalDiff(block *types.Block) (*big.Int, error) {
func (bc *ChainManager) Stop() {
close(bc.quit)
+
+ bc.wg.Wait()
+
+ glog.V(logger.Info).Infoln("Chain manager stopped")
}
type queueEvent struct {
@@ -504,6 +509,9 @@ func (self *ChainManager) procFutureBlocks() {
// InsertChain will attempt to insert the given chain in to the canonical chain or, otherwise, create a fork. It an error is returned
// it will return the index number of the failing block as well an error describing what went wrong (for possible errors see core/errors.go).
func (self *ChainManager) InsertChain(chain types.Blocks) (int, error) {
+ self.wg.Add(1)
+ defer self.wg.Done()
+
// A queued approach to delivering events. This is generally faster than direct delivery and requires much less mutex acquiring.
var (
queue = make([]interface{}, len(chain))