RanchiMall/electrumx
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix stats

Browse Source
This commit is contained in:
Neil Booth 2016-10-29 14:58:56 +09:00
parent 5c63cd40de
commit d0088e474a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/block_processor.py
View File

@ -124,7 +124,6 @@ class BlockProcessor(LoggedClass):
self.utxo_MB = env.utxo_MB self.utxo_MB = env.utxo_MB
self.hist_MB = env.hist_MB self.hist_MB = env.hist_MB
self.next_cache_check = 0 self.next_cache_check = 0
self.last_flush = time.time()
self.coin = env.coin self.coin = env.coin
self.caught_up = False self.caught_up = False
self.reorg_limit = env.reorg_limit self.reorg_limit = env.reorg_limit
@ -152,6 +151,9 @@ class BlockProcessor(LoggedClass):
self.fs_cache = FSCache(self.coin, self.height, self.tx_count) self.fs_cache = FSCache(self.coin, self.height, self.tx_count)
self.prefetcher = Prefetcher(daemon, self.height) self.prefetcher = Prefetcher(daemon, self.height)
self.last_flush = time.time()
self.last_flush_tx_count = self.tx_count
# Redirected member func # Redirected member func
self.get_tx_hash = self.fs_cache.get_tx_hash self.get_tx_hash = self.fs_cache.get_tx_hash
@ -348,6 +350,7 @@ class BlockProcessor(LoggedClass):
now = time.time() now = time.time()
self.wall_time += now - self.last_flush self.wall_time += now - self.last_flush
self.last_flush = now self.last_flush = now
self.last_flush_tx_count = self.tx_count
state = { state = {
'genesis': self.coin.GENESIS_HASH, 'genesis': self.coin.GENESIS_HASH,
'height': self.db_height, 'height': self.db_height,
@ -388,7 +391,7 @@ class BlockProcessor(LoggedClass):
flush_start = time.time() flush_start = time.time()
last_flush = self.last_flush last_flush = self.last_flush
tx_diff = self.tx_count - self.db_tx_count tx_diff = self.tx_count - self.last_flush_tx_count
# Write out the files to the FS before flushing to the DB. If # Write out the files to the FS before flushing to the DB. If
# the DB transaction fails, the files being too long doesn't # the DB transaction fails, the files being too long doesn't
@ -506,8 +509,8 @@ class BlockProcessor(LoggedClass):
'hist addrs: {:,d} hist size {:,d}' 'hist addrs: {:,d} hist size {:,d}'
.format(len(self.utxo_cache.cache), .format(len(self.utxo_cache.cache),
len(self.utxo_cache.db_cache), len(self.utxo_cache.db_cache),
self.history_size, len(self.history),
len(self.history))) self.history_size))
self.logger.info(' size: {:,d}MB (UTXOs {:,d}MB hist {:,d}MB)' self.logger.info(' size: {:,d}MB (UTXOs {:,d}MB hist {:,d}MB)'
.format(utxo_MB + hist_MB, utxo_MB, hist_MB)) .format(utxo_MB + hist_MB, utxo_MB, hist_MB))
return utxo_MB, hist_MB return utxo_MB, hist_MB