forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

1

Browse source
This commit is contained in:
Zsolt Felfoldi 2019-12-27 02:34:32 +01:00
parent c0b6ff20d1
commit 848683a203
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
les/clientpool.go
View file

@ -175,17 +175,18 @@ type priceFactors struct {
func newClientPool(db ethdb.Database, minCap, freeClientCap uint64, clock mclock.Clock, removePeer func(enode.ID)) *clientPool { func newClientPool(db ethdb.Database, minCap, freeClientCap uint64, clock mclock.Clock, removePeer func(enode.ID)) *clientPool {
ndb := newNodeDB(db, clock) ndb := newNodeDB(db, clock)
pool := &clientPool{ pool := &clientPool{
ndb: ndb, ndb: ndb,
clock: clock, clock: clock,
connectedMap: make(map[enode.ID]*clientInfo), connectedMap: make(map[enode.ID]*clientInfo),
activeQueue: prque.NewLazyQueue(connSetIndex, connPriority, connMaxPriority, clock, lazyQueueRefresh), activeQueue: prque.NewLazyQueue(connSetIndex, connPriority, connMaxPriority, clock, lazyQueueRefresh),
inactiveQueue: prque.New(connSetIndex), inactiveQueue: prque.New(connSetIndex),
minCap: minCap, dropInactivePeers: make(map[uint64][]*clientInfo),
freeClientCap: freeClientCap, minCap: minCap,
removePeer: removePeer, freeClientCap: freeClientCap,
startTime: clock.Now(), removePeer: removePeer,
cumulativeTime: ndb.getCumulativeTime(), startTime: clock.Now(),
stopCh: make(chan struct{}), cumulativeTime: ndb.getCumulativeTime(),
stopCh: make(chan struct{}),
} }
// calculate total token balance amount // calculate total token balance amount
var start enode.ID var start enode.ID
@ -416,7 +417,7 @@ func (f *clientPool) disconnect(p clientPeer) {
} }
tryActivate := e.active tryActivate := e.active
if e.active { if e.active {
f.deactivateClient(e) f.deactivateClient(e, false)
} }
f.finalizeBalance(e, f.clock.Now()) f.finalizeBalance(e, f.clock.Now())
f.inactiveQueue.Remove(e.queueIndex) f.inactiveQueue.Remove(e.queueIndex)
@ -488,7 +489,7 @@ func (f *clientPool) capAvailable(id enode.ID, freeID string, capacity uint64, m
} }
for _, c := range popList { for _, c := range popList {
if kick && c != client { if kick && c != client {
f.deactivateClient(c) f.deactivateClient(c, true)
} else { } else {
f.activeQueue.Push(c) f.activeQueue.Push(c)
} }
@ -529,7 +530,7 @@ func (f *clientPool) setDefaultFactors(posFactors, negFactors priceFactors) {
f.defaultNegFactors = negFactors f.defaultNegFactors = negFactors
} }
func (f *clientPool) deactivateClient(e *clientInfo) { func (f *clientPool) deactivateClient(e *clientInfo, scheduleDrop bool) {
if _, ok := f.connectedMap[e.id]; !ok || !e.active { if _, ok := f.connectedMap[e.id]; !ok || !e.active {
return return
} }
@ -543,7 +544,9 @@ func (f *clientPool) deactivateClient(e *clientInfo) {
e.peer.updateCapacity(0) e.peer.updateCapacity(0)
totalConnectedGauge.Update(int64(f.activeCap)) totalConnectedGauge.Update(int64(f.activeCap))
f.inactiveQueue.Push(e, -connPriority(e, f.clock.Now())) f.inactiveQueue.Push(e, -connPriority(e, f.clock.Now()))
f.dropInactivePeers[f.dropInactiveCounter+dropInactiveCycles] = append(f.dropInactivePeers[f.dropInactiveCounter+dropInactiveCycles], e) if scheduleDrop {
f.dropInactivePeers[f.dropInactiveCounter+dropInactiveCycles] = append(f.dropInactivePeers[f.dropInactiveCounter+dropInactiveCycles], e)
}
} }
func (f *clientPool) tryActivateClients() { func (f *clientPool) tryActivateClients() {
@ -650,7 +653,7 @@ func (f *clientPool) setLimits(totalConn int, totalCap uint64) {
f.capLimit = totalCap f.capLimit = totalCap
if f.activeCap > f.capLimit || f.activeQueue.Size() > f.activeLimit { if f.activeCap > f.capLimit || f.activeQueue.Size() > f.activeLimit {
f.activeQueue.MultiPop(func(data interface{}, priority int64) bool { f.activeQueue.MultiPop(func(data interface{}, priority int64) bool {
f.deactivateClient(data.(*clientInfo)) f.deactivateClient(data.(*clientInfo), true)
return f.activeCap > f.capLimit || f.activeQueue.Size() > f.activeLimit return f.activeCap > f.capLimit || f.activeQueue.Size() > f.activeLimit
}) })
} else { } else {