TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2025-05-04 19:02:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

mempool: replace timeStamp with blockStamp

Browse source 
Time is not really relevant for us here and we don't use this timestamp in any
way. Yet it occupies 24 bytes and we do two clock_gettime calls to get it.

Replace it with blockStamp which is going to be used in the future for
transaction retransmissions.

It allows to improve single-node TPS by another 3%.
This commit is contained in:
Roman Khimov 2020-09-09 15:32:31 +03:00
parent bc31ab3d2c
commit 5df726db68
5 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pkg/core/blockchainer/blockchainer.go
View file

@ -22,7 +22,6 @@ type Blockchainer interface {
AddHeaders(...*block.Header) error AddHeaders(...*block.Header) error
AddBlock(*block.Block) error AddBlock(*block.Block) error
AddStateRoot(r *state.MPTRoot) error AddStateRoot(r *state.MPTRoot) error
BlockHeight() uint32
CalculateClaimable(value *big.Int, startHeight, endHeight uint32) *big.Int CalculateClaimable(value *big.Int, startHeight, endHeight uint32) *big.Int
Close() Close()
HeaderHeight() uint32 HeaderHeight() uint32

1
pkg/core/mempool/feer.go
View file

@ -10,4 +10,5 @@ import (
type Feer interface { type Feer interface {
FeePerByte() int64 FeePerByte() int64
GetUtilityTokenBalance(util.Uint160) *big.Int GetUtilityTokenBalance(util.Uint160) *big.Int
BlockHeight() uint32
} }

9
pkg/core/mempool/mem_pool.go
View file

@ -5,7 +5,6 @@ import (
"math/big" "math/big"
"sort" "sort"
"sync" "sync"
"time"
"github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/core/transaction"
"github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/util"
@ -30,8 +29,8 @@ var (
// item represents a transaction in the the Memory pool. // item represents a transaction in the the Memory pool.
type item struct { type item struct {
txn *transaction.Transaction txn *transaction.Transaction
timeStamp time.Time blockStamp uint32
} }
// items is a slice of item. // items is a slice of item.
@ -148,8 +147,8 @@ func checkBalance(tx *transaction.Transaction, balance utilityBalanceAndFees) er
// Add tries to add given transaction to the Pool. // Add tries to add given transaction to the Pool.
func (mp *Pool) Add(t *transaction.Transaction, fee Feer) error { func (mp *Pool) Add(t *transaction.Transaction, fee Feer) error {
var pItem = item{ var pItem = item{
txn: t, txn: t,
timeStamp: time.Now().UTC(), blockStamp: fee.BlockHeight(),
} }
mp.lock.Lock() mp.lock.Lock()
if mp.containsKey(t.Hash()) { if mp.containsKey(t.Hash()) {

4
pkg/core/mempool/mem_pool_test.go
View file

@ -23,6 +23,10 @@ func (fs *FeerStub) FeePerByte() int64 {
return fs.feePerByte return fs.feePerByte
} }
func (fs *FeerStub) BlockHeight() uint32 {
return 0
}
func (fs *FeerStub) GetUtilityTokenBalance(uint160 util.Uint160) *big.Int { func (fs *FeerStub) GetUtilityTokenBalance(uint160 util.Uint160) *big.Int {
return balance return balance
} }

4
pkg/rpc/server/server_helper_test.go
View file

@ -91,6 +91,10 @@ func (fs *FeerStub) FeePerByte() int64 {
return 0 return 0
} }
func (fs *FeerStub) BlockHeight() uint32 {
return 0
}
func (fs *FeerStub) GetUtilityTokenBalance(acc util.Uint160) *big.Int { func (fs *FeerStub) GetUtilityTokenBalance(acc util.Uint160) *big.Int {
return big.NewInt(1000000 * native.GASFactor) return big.NewInt(1000000 * native.GASFactor)
} }