cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

fix edge case of effective performance for chains that dont fit in any partition

Browse Source 
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
This commit is contained in:
vyzo 2020-08-11 12:50:10 +03:00 committed by Jakub Sztandera
parent 8eff3a25f9
commit 080614098d
No known key found for this signature in database
GPG Key ID: 9A9AF56F8B3879BA
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
chain/messagepool/selection.go
View File

@ -123,14 +123,18 @@ func (mp *MessagePool) selectMessagesOptimal(curTs, ts *types.TipSet, tq float64
// 4. Compute effective performance for each chain, based on the partition they fall into // 4. Compute effective performance for each chain, based on the partition they fall into
// The effective performance is the gasPerf of the chain * block probability // The effective performance is the gasPerf of the chain * block probability
// Note that we don't have to do anything special about residues that didn't fit in any
// partition because these will already have an effective perf of 0 and will be pushed
// to the end by virtue of smaller gasPerf.
blockProb := mp.blockProbabilities(tq) blockProb := mp.blockProbabilities(tq)
effChains := 0
for i := 0; i < MaxBlocks; i++ { for i := 0; i < MaxBlocks; i++ {
for _, chain := range partitions[i] { for _, chain := range partitions[i] {
chain.SetEffectivePerf(blockProb[i]) chain.SetEffectivePerf(blockProb[i])
} }
effChains += len(partitions[i])
}
// nullify the effective performance of chains that don't fit in any partition
for _, chain := range chains[effChains:] {
chain.SetNullEffectivePerf()
} }
// 5. Resort the chains based on effective performance // 5. Resort the chains based on effective performance
@ -843,6 +847,14 @@ func (mc *msgChain) SetEffectivePerf(bp float64) {
mc.effPerf = mc.gasPerf * bp mc.effPerf = mc.gasPerf * bp
} }
func (mc *msgChain) SetNullEffectivePerf() {
if mc.gasPerf < 0 {
mc.effPerf = mc.gasPerf
} else {
mc.effPerf = 0
}
}
func (mc *msgChain) BeforeEffective(other *msgChain) bool { func (mc *msgChain) BeforeEffective(other *msgChain) bool {
return mc.effPerf > other.effPerf || return mc.effPerf > other.effPerf ||
(mc.effPerf == other.effPerf && mc.gasPerf > other.gasPerf) || (mc.effPerf == other.effPerf && mc.gasPerf > other.gasPerf) ||