mirror of https://github.com/ethereum/go-ethereum
Merge pull request #1789 from Gustav-Simonsson/core_remove_unused_functions
core, core/vm, core/state: remove unused functionspull/1786/head
Jeffrey Wilcke
9 years ago
commit
55ed8d108d
@ -1,120 +0,0 @@ |
|||||||
// Copyright 2015 The go-ethereum Authors
|
|
||||||
// This file is part of the go-ethereum library.
|
|
||||||
//
|
|
||||||
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
||||||
// it under the terms of the GNU Lesser General Public License as published by
|
|
||||||
// the Free Software Foundation, either version 3 of the License, or
|
|
||||||
// (at your option) any later version.
|
|
||||||
//
|
|
||||||
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
// GNU Lesser General Public License for more details.
|
|
||||||
//
|
|
||||||
// You should have received a copy of the GNU Lesser General Public License
|
|
||||||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
package core |
|
||||||
|
|
||||||
import ( |
|
||||||
"sync" |
|
||||||
|
|
||||||
"github.com/ethereum/go-ethereum/common" |
|
||||||
"github.com/ethereum/go-ethereum/core/types" |
|
||||||
) |
|
||||||
|
|
||||||
// BlockCache implements a caching mechanism specifically for blocks and uses FILO to pop
|
|
||||||
type BlockCache struct { |
|
||||||
size int |
|
||||||
|
|
||||||
hashes []common.Hash |
|
||||||
blocks map[common.Hash]*types.Block |
|
||||||
|
|
||||||
mu sync.RWMutex |
|
||||||
} |
|
||||||
|
|
||||||
// Creates and returns a `BlockCache` with `size`. If `size` is smaller than 1 it will panic
|
|
||||||
func NewBlockCache(size int) *BlockCache { |
|
||||||
if size < 1 { |
|
||||||
panic("block cache size not allowed to be smaller than 1") |
|
||||||
} |
|
||||||
|
|
||||||
bc := &BlockCache{size: size} |
|
||||||
bc.Clear() |
|
||||||
return bc |
|
||||||
} |
|
||||||
|
|
||||||
func (bc *BlockCache) Clear() { |
|
||||||
bc.blocks = make(map[common.Hash]*types.Block) |
|
||||||
bc.hashes = nil |
|
||||||
|
|
||||||
} |
|
||||||
|
|
||||||
func (bc *BlockCache) Push(block *types.Block) { |
|
||||||
bc.mu.Lock() |
|
||||||
defer bc.mu.Unlock() |
|
||||||
|
|
||||||
if len(bc.hashes) == bc.size { |
|
||||||
delete(bc.blocks, bc.hashes[0]) |
|
||||||
|
|
||||||
// XXX There are a few other options on solving this
|
|
||||||
// 1) use a poller / GC like mechanism to clean up untracked objects
|
|
||||||
// 2) copy as below
|
|
||||||
// re-use the slice and remove the reference to bc.hashes[0]
|
|
||||||
// this will allow the element to be garbage collected.
|
|
||||||
copy(bc.hashes, bc.hashes[1:]) |
|
||||||
} else { |
|
||||||
bc.hashes = append(bc.hashes, common.Hash{}) |
|
||||||
} |
|
||||||
|
|
||||||
hash := block.Hash() |
|
||||||
bc.blocks[hash] = block |
|
||||||
bc.hashes[len(bc.hashes)-1] = hash |
|
||||||
} |
|
||||||
|
|
||||||
func (bc *BlockCache) Delete(hash common.Hash) { |
|
||||||
bc.mu.Lock() |
|
||||||
defer bc.mu.Unlock() |
|
||||||
|
|
||||||
if _, ok := bc.blocks[hash]; ok { |
|
||||||
delete(bc.blocks, hash) |
|
||||||
for i, h := range bc.hashes { |
|
||||||
if hash == h { |
|
||||||
bc.hashes = bc.hashes[:i+copy(bc.hashes[i:], bc.hashes[i+1:])] |
|
||||||
// or ? => bc.hashes = append(bc.hashes[:i], bc.hashes[i+1]...)
|
|
||||||
|
|
||||||
break |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
func (bc *BlockCache) Get(hash common.Hash) *types.Block { |
|
||||||
bc.mu.RLock() |
|
||||||
defer bc.mu.RUnlock() |
|
||||||
|
|
||||||
if block, haz := bc.blocks[hash]; haz { |
|
||||||
return block |
|
||||||
} |
|
||||||
|
|
||||||
return nil |
|
||||||
} |
|
||||||
|
|
||||||
func (bc *BlockCache) Has(hash common.Hash) bool { |
|
||||||
bc.mu.RLock() |
|
||||||
defer bc.mu.RUnlock() |
|
||||||
|
|
||||||
_, ok := bc.blocks[hash] |
|
||||||
return ok |
|
||||||
} |
|
||||||
|
|
||||||
func (bc *BlockCache) Each(cb func(int, *types.Block)) { |
|
||||||
bc.mu.Lock() |
|
||||||
defer bc.mu.Unlock() |
|
||||||
|
|
||||||
i := 0 |
|
||||||
for _, block := range bc.blocks { |
|
||||||
cb(i, block) |
|
||||||
i++ |
|
||||||
} |
|
||||||
} |
|
||||||
@ -1,76 +0,0 @@ |
|||||||
// Copyright 2015 The go-ethereum Authors
|
|
||||||
// This file is part of the go-ethereum library.
|
|
||||||
//
|
|
||||||
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
||||||
// it under the terms of the GNU Lesser General Public License as published by
|
|
||||||
// the Free Software Foundation, either version 3 of the License, or
|
|
||||||
// (at your option) any later version.
|
|
||||||
//
|
|
||||||
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
// GNU Lesser General Public License for more details.
|
|
||||||
//
|
|
||||||
// You should have received a copy of the GNU Lesser General Public License
|
|
||||||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
package core |
|
||||||
|
|
||||||
import ( |
|
||||||
"math/big" |
|
||||||
"testing" |
|
||||||
|
|
||||||
"github.com/ethereum/go-ethereum/common" |
|
||||||
"github.com/ethereum/go-ethereum/core/types" |
|
||||||
) |
|
||||||
|
|
||||||
func newChain(size int) (chain []*types.Block) { |
|
||||||
var parentHash common.Hash |
|
||||||
for i := 0; i < size; i++ { |
|
||||||
head := &types.Header{ParentHash: parentHash, Number: big.NewInt(int64(i))} |
|
||||||
block := types.NewBlock(head, nil, nil, nil) |
|
||||||
chain = append(chain, block) |
|
||||||
parentHash = block.Hash() |
|
||||||
} |
|
||||||
return chain |
|
||||||
} |
|
||||||
|
|
||||||
func insertChainCache(cache *BlockCache, chain []*types.Block) { |
|
||||||
for _, block := range chain { |
|
||||||
cache.Push(block) |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
func TestNewBlockCache(t *testing.T) { |
|
||||||
chain := newChain(3) |
|
||||||
cache := NewBlockCache(2) |
|
||||||
insertChainCache(cache, chain) |
|
||||||
|
|
||||||
if cache.hashes[0] != chain[1].Hash() { |
|
||||||
t.Error("oldest block incorrect") |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
func TestInclusion(t *testing.T) { |
|
||||||
chain := newChain(3) |
|
||||||
cache := NewBlockCache(3) |
|
||||||
insertChainCache(cache, chain) |
|
||||||
|
|
||||||
for _, block := range chain { |
|
||||||
if b := cache.Get(block.Hash()); b == nil { |
|
||||||
t.Errorf("getting %x failed", block.Hash()) |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
func TestDeletion(t *testing.T) { |
|
||||||
chain := newChain(3) |
|
||||||
cache := NewBlockCache(3) |
|
||||||
insertChainCache(cache, chain) |
|
||||||
|
|
||||||
cache.Delete(chain[1].Hash()) |
|
||||||
|
|
||||||
if cache.Has(chain[1].Hash()) { |
|
||||||
t.Errorf("expected %x not to be included") |
|
||||||
} |
|
||||||
} |
|
||||||
Loading…
Reference in new issue