interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

separate lock for blacklist

This commit is contained in:
zelig 2015-04-09 13:58:11 +01:00
parent a009132c24
commit be25396340
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
blockpool/peers.go
View File

@ -57,7 +57,8 @@ type peer struct {
// peers is the component keeping a record of peers in a hashmap // peers is the component keeping a record of peers in a hashmap
// //
type peers struct { type peers struct {
lock sync.RWMutex lock sync.RWMutex
bllock sync.Mutex
bp *BlockPool bp *BlockPool
errors *errs.Errors errors *errs.Errors
@ -109,13 +110,15 @@ func (self *peers) peerError(id string, code int, format string, params ...inter
// record time of offence in blacklist to implement suspension for PeerSuspensionInterval // record time of offence in blacklist to implement suspension for PeerSuspensionInterval
func (self *peers) addToBlacklist(id string) { func (self *peers) addToBlacklist(id string) {
self.lock.Lock() self.bllock.Lock()
defer self.lock.Unlock() defer self.bllock.Unlock()
self.blacklist[id] = time.Now() self.blacklist[id] = time.Now()
} }
// suspended checks if peer is still suspended, caller should hold peers.lock // suspended checks if peer is still suspended, caller should hold peers.lock
func (self *peers) suspended(id string) (s bool) { func (self *peers) suspended(id string) (s bool) {
self.bllock.Lock()
defer self.bllock.Unlock()
if suspendedAt, ok := self.blacklist[id]; ok { if suspendedAt, ok := self.blacklist[id]; ok {
if s = suspendedAt.Add(self.bp.Config.PeerSuspensionInterval).After(time.Now()); !s { if s = suspendedAt.Add(self.bp.Config.PeerSuspensionInterval).After(time.Now()); !s {
// no longer suspended, delete entry // no longer suspended, delete entry