Merge pull request #1014 from fjl/p2p-dialer-3000

p2p: new dialer, peer management without locks
This commit is contained in:
Jeffrey Wilcke
2015-05-26 05:06:00 -07:00
30 changed files with 7998 additions and 1486 deletions

View File

@ -535,6 +535,7 @@ func (self *Ethereum) AddPeer(nodeURL string) error {
func (s *Ethereum) Stop() {
s.txSub.Unsubscribe() // quits txBroadcastLoop
s.net.Stop()
s.protocolManager.Stop()
s.chainManager.Stop()
s.txPool.Stop()
@ -544,7 +545,6 @@ func (s *Ethereum) Stop() {
}
s.StopAutoDAG()
glog.V(logger.Info).Infoln("Server stopped")
close(s.shutdownChan)
}