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

whisper: remove unnecessary advertised map and make advertisements more aggressive

Browse source
This commit is contained in:
Dmitry Shulyak 2018-02-16 16:25:50 +02:00
parent f0de0f2230
commit 9294ebbc12
1 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
whisper/whisperv5/peer.go
View file

@ -34,23 +34,21 @@ type Peer struct {
ws p2p.MsgReadWriter ws p2p.MsgReadWriter
trusted bool trusted bool
known *set.Set // Messages already known by the peer to avoid wasting bandwidth known *set.Set // Messages already known by the peer to avoid wasting bandwidth
advertised map[common.Hash]struct{} hashes chan common.Hash
hashes chan common.Hash quit chan struct{}
quit chan struct{}
} }
// newPeer creates a new whisper peer object, but does not run the handshake itself. // newPeer creates a new whisper peer object, but does not run the handshake itself.
func newPeer(host *Whisper, remote *p2p.Peer, rw p2p.MsgReadWriter) *Peer { func newPeer(host *Whisper, remote *p2p.Peer, rw p2p.MsgReadWriter) *Peer {
return &Peer{ return &Peer{
host: host, host: host,
peer: remote, peer: remote,
ws: rw, ws: rw,
trusted: false, trusted: false,
known: set.New(), known: set.New(),
advertised: make(map[common.Hash]struct{}), hashes: make(chan common.Hash, 20),
hashes: make(chan common.Hash, 20), quit: make(chan struct{}),
quit: make(chan struct{}),
} }
} }
@ -104,8 +102,8 @@ func (p *Peer) update() {
// Start the tickers for the updates // Start the tickers for the updates
expire := time.NewTicker(expirationCycle) expire := time.NewTicker(expirationCycle)
transmit := time.NewTicker(transmissionCycle) transmit := time.NewTicker(transmissionCycle)
hashesTransmit := time.NewTicker(100 * time.Millisecond) hashesTransmit := time.NewTicker(20 * time.Millisecond)
hashes := make([]common.Hash, 0, 10) hashes := make([]common.Hash, 0, 4)
// Loop and transmit until termination is requested // Loop and transmit until termination is requested
for { for {
select { select {
@ -124,9 +122,6 @@ func (p *Peer) update() {
} }
hashes = hashes[:0] hashes = hashes[:0]
case hash := <-p.hashes: case hash := <-p.hashes:
if _, ok := p.advertised[hash]; ok {
continue
}
if p.known.Has(hash) { if p.known.Has(hash) {
continue continue
} }
@ -201,13 +196,7 @@ func (p *Peer) broadcastHashes(hashes []common.Hash) error {
return nil return nil
} }
log.Trace("broadcast", "hashes", hashes) log.Trace("broadcast", "hashes", hashes)
if err := p2p.Send(p.ws, hashesCode, hashes); err != nil { return p2p.Send(p.ws, hashesCode, hashes)
return err
}
for _, hash := range hashes {
p.advertised[hash] = struct{}{}
}
return nil
} }
func (p *Peer) ID() []byte { func (p *Peer) ID() []byte {