LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

Issue #90: Improve addblock logging by reporting every 10 seconds instead of X number of blocks

Browse source 
blockImporter now has these new properties:

txProcessed - number of transactions processed by the importer
lastHeight - height of the last imported block
lastBlockTime - block time of the last imported block
lastLogTime - last timestamp of when a progress message was shown

the p/progress option in addblocks now indicates how often you want the progress message to appear
This commit is contained in:
Jimmy Song 2014-03-18 20:23:27 -05:00
parent 3b9b11cb41
commit b12e2fc1db
2 changed files with 36 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
util/addblock/config.go
View file

@ -18,7 +18,7 @@ import (
const (
defaultDbType = "leveldb"
defaultDataFile = "bootstrap.dat"
defaultProgress = 10000
defaultProgress = 10
)
var (
@ -36,7 +36,7 @@ type config struct {
DbType string `long:"dbtype" description:"Database backend to use for the Block Chain"`
TestNet3 bool `long:"testnet" description:"Use the test network"`
InFile string `short:"i" long:"infile" description:"File containing the block(s)"`
Progress int `short:"p" long:"progress" description:"Show a progress message every time this number of blocks is processed -- Use 0 to disable progress announcements"`
Progress int `short:"p" long:"progress" description:"Show a progress message each time this number of seconds have passed -- Use 0 to disable progress announcements"`
}
// filesExists reports whether the named file or directory exists.

37
util/addblock/import.go
View file

@ -14,6 +14,7 @@ import (
"github.com/conformal/btcwire"
"io"
"sync"
"time"
)
var zeroHash = btcwire.ShaHash{}
@ -38,6 +39,10 @@ type blockImporter struct {
wg sync.WaitGroup
blocksProcessed int64
blocksImported int64
txProcessed int64
lastHeight int64
lastBlockTime time.Time
lastLogTime time.Time
}
// readBlock reads the next block from the input file.
@ -87,6 +92,7 @@ func (bi *blockImporter) readBlock() ([]byte, error) {
func (bi *blockImporter) processBlock(serializedBlock []byte) (bool, error) {
// Deserialize the block which includes checks for malformed blocks.
block, err := btcutil.NewBlockFromBytes(serializedBlock)
if err != nil {
return false, err
}
@ -96,6 +102,10 @@ func (bi *blockImporter) processBlock(serializedBlock []byte) (bool, error) {
return false, err
}
// update block statistics
bi.txProcessed += int64(len(block.MsgBlock().Transactions))
bi.lastBlockTime = block.MsgBlock().Header.Timestamp
// Skip blocks that already exist.
if bi.db.ExistsSha(blockSha) {
return false, nil
@ -165,6 +175,7 @@ out:
}
bi.blocksProcessed++
bi.lastHeight++
imported, err := bi.processBlock(serializedBlock)
if err != nil {
bi.errChan <- err
@ -175,9 +186,28 @@ out:
bi.blocksImported++
}
if cfg.Progress != 0 && bi.blocksProcessed > 0 &&
bi.blocksProcessed%int64(cfg.Progress) == 0 {
log.Infof("Processed %d blocks", bi.blocksProcessed)
// report every cfg.Progress seconds
now := time.Now()
duration := now.Sub(bi.lastLogTime)
if cfg.Progress != 0 && bi.blocksProcessed > 0 &&
duration > time.Second * time.Duration(cfg.Progress) {
durationMillis := int64(duration / time.Millisecond)
tDuration := 10 * time.Millisecond * time.Duration(durationMillis/10)
blockStr := "blocks"
if bi.blocksProcessed == 1 {
blockStr = "block"
}
txStr := "transactions"
if bi.txProcessed == 1 {
txStr = "transaction"
}
log.Infof("Processed %d %s in the last %s (%d %s, height %d, %s)",
bi.blocksProcessed, blockStr, tDuration, bi.txProcessed,
txStr, bi.lastHeight, bi.lastBlockTime)
bi.lastLogTime = now
}
case <-bi.quit:
@ -247,5 +277,6 @@ func newBlockImporter(db btcdb.Db, r io.ReadSeeker) *blockImporter {
errChan: make(chan error),
quit: make(chan bool),
chain: btcchain.New(db, activeNetwork, nil),
lastLogTime: time.Now(),
}
}