aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Godeps/Godeps.json24
-rw-r--r--Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go6
-rw-r--r--Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/pool.go21
-rw-r--r--Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/pool_legacy.go33
-rw-r--r--core/blockchain.go4
-rw-r--r--core/headerchain.go68
-rw-r--r--eth/downloader/peer.go4
7 files changed, 69 insertions, 91 deletions
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 9bcc8c756..f0a250274 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -140,51 +140,51 @@
},
{
"ImportPath": "github.com/syndtr/goleveldb/leveldb",
- "Rev": "ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280"
+ "Rev": "917f41c560270110ceb73c5b38be2a9127387071"
},
{
"ImportPath": "github.com/syndtr/goleveldb/leveldb/cache",
- "Rev": "ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280"
+ "Rev": "917f41c560270110ceb73c5b38be2a9127387071"
},
{
"ImportPath": "github.com/syndtr/goleveldb/leveldb/comparer",
- "Rev": "ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280"
+ "Rev": "917f41c560270110ceb73c5b38be2a9127387071"
},
{
"ImportPath": "github.com/syndtr/goleveldb/leveldb/errors",
- "Rev": "ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280"
+ "Rev": "917f41c560270110ceb73c5b38be2a9127387071"
},
{
"ImportPath": "github.com/syndtr/goleveldb/leveldb/filter",
- "Rev": "ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280"
+ "Rev": "917f41c560270110ceb73c5b38be2a9127387071"
},
{
"ImportPath": "github.com/syndtr/goleveldb/leveldb/iterator",
- "Rev": "ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280"
+ "Rev": "917f41c560270110ceb73c5b38be2a9127387071"
},
{
"ImportPath": "github.com/syndtr/goleveldb/leveldb/journal",
- "Rev": "ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280"
+ "Rev": "917f41c560270110ceb73c5b38be2a9127387071"
},
{
"ImportPath": "github.com/syndtr/goleveldb/leveldb/memdb",
- "Rev": "ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280"
+ "Rev": "917f41c560270110ceb73c5b38be2a9127387071"
},
{
"ImportPath": "github.com/syndtr/goleveldb/leveldb/opt",
- "Rev": "ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280"
+ "Rev": "917f41c560270110ceb73c5b38be2a9127387071"
},
{
"ImportPath": "github.com/syndtr/goleveldb/leveldb/storage",
- "Rev": "ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280"
+ "Rev": "917f41c560270110ceb73c5b38be2a9127387071"
},
{
"ImportPath": "github.com/syndtr/goleveldb/leveldb/table",
- "Rev": "ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280"
+ "Rev": "917f41c560270110ceb73c5b38be2a9127387071"
},
{
"ImportPath": "github.com/syndtr/goleveldb/leveldb/util",
- "Rev": "ad0d8b2ab58a55ed5c58073aa46451d5e1ca1280"
+ "Rev": "917f41c560270110ceb73c5b38be2a9127387071"
},
{
"ImportPath": "golang.org/x/crypto/pbkdf2",
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go
index fb7896139..5576761fe 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go
@@ -166,15 +166,15 @@ func (db *DB) Write(b *Batch, wo *opt.WriteOptions) (err error) {
merged := 0
danglingMerge := false
defer func() {
+ for i := 0; i < merged; i++ {
+ db.writeAckC <- err
+ }
if danglingMerge {
// Only one dangling merge at most, so this is safe.
db.writeMergedC <- false
} else {
<-db.writeLockC
}
- for i := 0; i < merged; i++ {
- db.writeAckC <- err
- }
}()
mdb, mdbFree, err := db.flush(b.size())
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/pool.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/pool.go
deleted file mode 100644
index 1f7fdd41f..000000000
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/pool.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// +build go1.3
-
-package util
-
-import (
- "sync"
-)
-
-type Pool struct {
- sync.Pool
-}
-
-func NewPool(cap int) *Pool {
- return &Pool{}
-}
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/pool_legacy.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/pool_legacy.go
deleted file mode 100644
index 27b8d03be..000000000
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/pool_legacy.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// +build !go1.3
-
-package util
-
-type Pool struct {
- pool chan interface{}
-}
-
-func (p *Pool) Get() interface{} {
- select {
- case x := <-p.pool:
- return x
- default:
- return nil
- }
-}
-
-func (p *Pool) Put(x interface{}) {
- select {
- case p.pool <- x:
- default:
- }
-}
-
-func NewPool(cap int) *Pool {
- return &Pool{pool: make(chan interface{}, cap)}
-}
diff --git a/core/blockchain.go b/core/blockchain.go
index 1d161dbf1..284c549e3 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -367,7 +367,7 @@ func (bc *BlockChain) ResetWithGenesisBlock(genesis *types.Block) {
defer bc.mu.Unlock()
// Prepare the genesis block and reinitialise the chain
- if err := WriteTd(bc.chainDb, genesis.Hash(), genesis.Difficulty()); err != nil {
+ if err := bc.hc.WriteTd(genesis.Hash(), genesis.Difficulty()); err != nil {
glog.Fatalf("failed to write genesis block TD: %v", err)
}
if err := WriteBlock(bc.chainDb, genesis); err != nil {
@@ -788,7 +788,7 @@ func (self *BlockChain) WriteBlock(block *types.Block) (status WriteStatus, err
status = SideStatTy
}
// Irrelevant of the canonical status, write the block itself to the database
- if err := WriteTd(self.chainDb, block.Hash(), externTd); err != nil {
+ if err := self.hc.WriteTd(block.Hash(), externTd); err != nil {
glog.Fatalf("failed to write block total difficulty: %v", err)
}
if err := WriteBlock(self.chainDb, block); err != nil {
diff --git a/core/headerchain.go b/core/headerchain.go
index 8528801a7..255139dde 100644
--- a/core/headerchain.go
+++ b/core/headerchain.go
@@ -43,11 +43,13 @@ type HeaderChain struct {
chainDb ethdb.Database
genesisHeader *types.Header
- currentHeader *types.Header // Current head of the header chain (may be above the block chain!)
- headerCache *lru.Cache // Cache for the most recent block headers
- tdCache *lru.Cache // Cache for the most recent block total difficulties
+ currentHeader *types.Header // Current head of the header chain (may be above the block chain!)
+ currentHeaderHash common.Hash // Hash of the current head of the header chain (prevent recomputing all the time)
- procInterrupt func() bool
+ headerCache *lru.Cache // Cache for the most recent block headers
+ tdCache *lru.Cache // Cache for the most recent block total difficulties
+
+ procInterrupt func() bool
rand *mrand.Rand
getValidator getHeaderValidatorFn
@@ -95,6 +97,7 @@ func NewHeaderChain(chainDb ethdb.Database, getValidator getHeaderValidatorFn, p
hc.currentHeader = chead
}
}
+ hc.currentHeaderHash = hc.currentHeader.Hash()
return hc, nil
}
@@ -109,12 +112,17 @@ func NewHeaderChain(chainDb ethdb.Database, getValidator getHeaderValidatorFn, p
// in two scenarios: pure-header mode of operation (light clients), or properly
// separated header/block phases (non-archive clients).
func (hc *HeaderChain) WriteHeader(header *types.Header) (status WriteStatus, err error) {
+ // Cache some values to prevent constant recalculation
+ var (
+ hash = header.Hash()
+ number = header.Number.Uint64()
+ )
// Calculate the total difficulty of the header
ptd := hc.GetTd(header.ParentHash)
if ptd == nil {
return NonStatTy, ParentError(header.ParentHash)
}
- localTd := hc.GetTd(hc.currentHeader.Hash())
+ localTd := hc.GetTd(hc.currentHeaderHash)
externTd := new(big.Int).Add(header.Difficulty, ptd)
// If the total difficulty is higher than our known, add it to the canonical chain
@@ -122,34 +130,44 @@ func (hc *HeaderChain) WriteHeader(header *types.Header) (status WriteStatus, er
// Please refer to http://www.cs.cornell.edu/~ie53/publications/btcProcFC.pdf
if externTd.Cmp(localTd) > 0 || (externTd.Cmp(localTd) == 0 && mrand.Float64() < 0.5) {
// Delete any canonical number assignments above the new head
- for i := header.Number.Uint64() + 1; GetCanonicalHash(hc.chainDb, i) != (common.Hash{}); i++ {
+ for i := number + 1; GetCanonicalHash(hc.chainDb, i) != (common.Hash{}); i++ {
DeleteCanonicalHash(hc.chainDb, i)
}
// Overwrite any stale canonical number assignments
- head := hc.GetHeader(header.ParentHash)
- for GetCanonicalHash(hc.chainDb, head.Number.Uint64()) != head.Hash() {
- WriteCanonicalHash(hc.chainDb, head.Hash(), head.Number.Uint64())
- head = hc.GetHeader(head.ParentHash)
+ var (
+ headHash = header.ParentHash
+ headHeader = hc.GetHeader(headHash)
+ headNumber = headHeader.Number.Uint64()
+ )
+ for GetCanonicalHash(hc.chainDb, headNumber) != headHash {
+ WriteCanonicalHash(hc.chainDb, headHash, headNumber)
+
+ headHash = headHeader.ParentHash
+ headHeader = hc.GetHeader(headHash)
+ headNumber = headHeader.Number.Uint64()
}
// Extend the canonical chain with the new header
- if err := WriteCanonicalHash(hc.chainDb, header.Hash(), header.Number.Uint64()); err != nil {
+ if err := WriteCanonicalHash(hc.chainDb, hash, number); err != nil {
glog.Fatalf("failed to insert header number: %v", err)
}
- if err := WriteHeadHeaderHash(hc.chainDb, header.Hash()); err != nil {
+ if err := WriteHeadHeaderHash(hc.chainDb, hash); err != nil {
glog.Fatalf("failed to insert head header hash: %v", err)
}
- hc.currentHeader = types.CopyHeader(header)
+ hc.currentHeaderHash, hc.currentHeader = hash, types.CopyHeader(header)
+
status = CanonStatTy
} else {
status = SideStatTy
}
// Irrelevant of the canonical status, write the header itself to the database
- if err := WriteTd(hc.chainDb, header.Hash(), externTd); err != nil {
+ if err := hc.WriteTd(hash, externTd); err != nil {
glog.Fatalf("failed to write header total difficulty: %v", err)
}
if err := WriteHeader(hc.chainDb, header); err != nil {
glog.Fatalf("failed to write header contents: %v", err)
}
+ hc.headerCache.Add(hash, header)
+
return
}
@@ -285,10 +303,11 @@ func (hc *HeaderChain) GetBlockHashesFromHash(hash common.Hash, max uint64) []co
// Iterate the headers until enough is collected or the genesis reached
chain := make([]common.Hash, 0, max)
for i := uint64(0); i < max; i++ {
- if header = hc.GetHeader(header.ParentHash); header == nil {
+ next := header.ParentHash
+ if header = hc.GetHeader(next); header == nil {
break
}
- chain = append(chain, header.Hash())
+ chain = append(chain, next)
if header.Number.Cmp(common.Big0) == 0 {
break
}
@@ -312,6 +331,16 @@ func (hc *HeaderChain) GetTd(hash common.Hash) *big.Int {
return td
}
+// WriteTd stores a block's total difficulty into the database, also caching it
+// along the way.
+func (hc *HeaderChain) WriteTd(hash common.Hash, td *big.Int) error {
+ if err := WriteTd(hc.chainDb, hash, td); err != nil {
+ return err
+ }
+ hc.tdCache.Add(hash, new(big.Int).Set(td))
+ return nil
+}
+
// GetHeader retrieves a block header from the database by hash, caching it if
// found.
func (hc *HeaderChain) GetHeader(hash common.Hash) *types.Header {
@@ -324,7 +353,7 @@ func (hc *HeaderChain) GetHeader(hash common.Hash) *types.Header {
return nil
}
// Cache the found header for next time and return
- hc.headerCache.Add(header.Hash(), header)
+ hc.headerCache.Add(hash, header)
return header
}
@@ -356,6 +385,7 @@ func (hc *HeaderChain) SetCurrentHeader(head *types.Header) {
glog.Fatalf("failed to insert head header hash: %v", err)
}
hc.currentHeader = head
+ hc.currentHeaderHash = head.Hash()
}
// DeleteCallback is a callback function that is called by SetHead before
@@ -390,7 +420,9 @@ func (hc *HeaderChain) SetHead(head uint64, delFn DeleteCallback) {
if hc.currentHeader == nil {
hc.currentHeader = hc.genesisHeader
}
- if err := WriteHeadHeaderHash(hc.chainDb, hc.currentHeader.Hash()); err != nil {
+ hc.currentHeaderHash = hc.currentHeader.Hash()
+
+ if err := WriteHeadHeaderHash(hc.chainDb, hc.currentHeaderHash); err != nil {
glog.Fatalf("failed to reset head header hash: %v", err)
}
}
diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go
index 80f08b68f..c4846194b 100644
--- a/eth/downloader/peer.go
+++ b/eth/downloader/peer.go
@@ -251,8 +251,8 @@ func (p *peer) setIdle(started time.Time, delivered int, throughput *float64, id
// Irrelevant of the scaling, make sure the peer ends up idle
defer atomic.StoreInt32(idle, 0)
- p.lock.RLock()
- defer p.lock.RUnlock()
+ p.lock.Lock()
+ defer p.lock.Unlock()
// If nothing was delivered (hard timeout / unavailable data), reduce throughput to minimum
if delivered == 0 {
generated by cgit (git 2.34.1) at 2024-10-17 20:29:15 +0800