reduce unnecessary locking and copying; increase peer maxKnownTxs #39
Conversation
| @@ -178,7 +177,7 @@ func (ethash *Ethash) VerifyUncles(chain consensus.ChainReader, block *types.Blo | |||
| return errTooManyUncles | |||
| } | |||
| // Gather the set of past uncles and ancestors | |||
| uncles, ancestors := set.New(), make(map[common.Hash]*types.Header) | |||
| uncles, ancestors := make(map[common.Hash]struct{}), make(map[common.Hash]*types.Header) | |||
There was a problem hiding this comment.
No need to lock in here.
| @@ -229,7 +229,7 @@ func GetBlock(db DatabaseReader, hash common.Hash, number uint64) *types.Block { | |||
| return nil | |||
| } | |||
| // Reassemble the block and return | |||
| return types.NewBlockWithHeader(header).WithBody(body.Transactions, body.Uncles) | |||
| return types.NewBlockWith(header, body) | |||
There was a problem hiding this comment.
We just deserialized these, so nobody else has them, don't call routines that make copies, use a new function to just set them.
| @@ -705,7 +705,7 @@ func (pm *ProtocolManager) BroadcastBlock(block *types.Block, propagate bool) { | |||
| // Otherwise if the block is indeed in out own chain, announce it | |||
| if pm.blockchain.HasBlock(hash, block.NumberU64()) { | |||
| for _, peer := range peers { | |||
| peer.SendNewBlockHashes([]common.Hash{hash}, []uint64{block.NumberU64()}) | |||
| peer.SendNewBlockHash(hash, block.NumberU64()) | |||
There was a problem hiding this comment.
This is the only usage. Don't make slices.
| @@ -37,8 +36,8 @@ var ( | |||
| ) | |||
|
|
|||
| const ( | |||
| maxKnownTxs = 32768 // Maximum transactions hashes to keep in the known list (prevent DOS) | |||
| maxKnownBlocks = 1024 // Maximum block hashes to keep in the known list (prevent DOS) | |||
| maxKnownTxs = 262144 // Maximum transactions hashes to keep in the known list (prevent DOS) | |||
There was a problem hiding this comment.
Per peer set of known txs. Octupled. Maybe overkill?
| type setOfHash struct { | ||
| sync.RWMutex | ||
| m map[common.Hash]struct{} | ||
| } |
There was a problem hiding this comment.
Minimal custom replacement for gopkg.in/fatih/set.v0.Set. Besides avoiding interface{} conversions, we also can do smarter locking, e.g. locking once outside a big loop instead of repeatedly inside the loop.
There was a problem hiding this comment.
Named awkwardly b/c I thought hashSet or commonHashSet would be confusing.
| } | ||
| r.knownTxs.m = make(map[common.Hash]struct{}, maxKnownTxs) | ||
| r.knownBlocks.m = make(map[common.Hash]struct{}, maxKnownBlocks) |
There was a problem hiding this comment.
Make these at cap to begin with.
| ancestors map[common.Hash]struct{} // ancestor set (used for checking uncle parent validity) | ||
| family map[common.Hash]struct{} // family set (used for checking uncle invalidity) | ||
| uncles map[common.Hash]struct{} // uncle set | ||
| uncleMu sync.RWMutex |
There was a problem hiding this comment.
Only uncles needs to lock. ancestors and family are only read after being set up (from makeCurrent()).
This change removes or replaces some uses of a generic concurrent set from
gopkg.in/fatih/set.v0, removes some unnecessary slice copies, and increasesmaxKnownTxs.