grassrootseconomics/openethereum
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

replace cache manager with mutex; reduce lock hold times

Browse Source
This commit is contained in:
Robert Habermeier 2016-08-08 16:25:48 +02:00
parent c5a0024eeb
commit 9732da5101
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ethcore/src/blockchain/blockchain.rs
View File

@ -134,7 +134,7 @@ impl bc::group::BloomGroupDatabase for BlockChain {
fn blooms_at(&self, position: &bc::group::GroupPosition) -> Option<bc::group::BloomGroup> { fn blooms_at(&self, position: &bc::group::GroupPosition) -> Option<bc::group::BloomGroup> {
let position = LogGroupPosition::from(position.clone()); let position = LogGroupPosition::from(position.clone());
let result = self.db.read_with_cache(DB_COL_EXTRA, &self.blocks_blooms, &position).map(Into::into); let result = self.db.read_with_cache(DB_COL_EXTRA, &self.blocks_blooms, &position).map(Into::into);
self.note_used(CacheID::BlocksBlooms(position)); self.cache_man.lock().note_used(CacheID::BlocksBlooms(position));
result result
} }
} }
@ -161,7 +161,7 @@ pub struct BlockChain {
db: Arc<Database>, db: Arc<Database>,
cache_man: RwLock<CacheManager<CacheID>>, cache_man: Mutex<CacheManager<CacheID>>,
pending_best_block: RwLock<Option<BestBlock>>, pending_best_block: RwLock<Option<BestBlock>>,
pending_block_hashes: RwLock<HashMap<BlockNumber, H256>>, pending_block_hashes: RwLock<HashMap<BlockNumber, H256>>,
@ -222,7 +222,7 @@ impl BlockProvider for BlockChain {
None => None None => None
}; };
self.note_used(CacheID::BlockHeader(hash.clone())); self.cache_man.lock().note_used(CacheID::BlockHeader(hash.clone()));
result result
} }
@ -258,7 +258,7 @@ impl BlockProvider for BlockChain {
None => None None => None
}; };
self.note_used(CacheID::BlockBody(hash.clone())); self.cache_man.lock().note_used(CacheID::BlockBody(hash.clone()));
result result
} }
@ -266,28 +266,28 @@ impl BlockProvider for BlockChain {
/// Get the familial details concerning a block. /// Get the familial details concerning a block.
fn block_details(&self, hash: &H256) -> Option<BlockDetails> { fn block_details(&self, hash: &H256) -> Option<BlockDetails> {
let result = self.db.read_with_cache(DB_COL_EXTRA, &self.block_details, hash); let result = self.db.read_with_cache(DB_COL_EXTRA, &self.block_details, hash);
self.note_used(CacheID::BlockDetails(hash.clone())); self.cache_man.lock().note_used(CacheID::BlockDetails(hash.clone()));
result result
} }
/// Get the hash of given block's number. /// Get the hash of given block's number.
fn block_hash(&self, index: BlockNumber) -> Option<H256> { fn block_hash(&self, index: BlockNumber) -> Option<H256> {
let result = self.db.read_with_cache(DB_COL_EXTRA, &self.block_hashes, &index); let result = self.db.read_with_cache(DB_COL_EXTRA, &self.block_hashes, &index);
self.note_used(CacheID::BlockHashes(index)); self.cache_man.lock().note_used(CacheID::BlockHashes(index));
result result
} }
/// Get the address of transaction with given hash. /// Get the address of transaction with given hash.
fn transaction_address(&self, hash: &H256) -> Option<TransactionAddress> { fn transaction_address(&self, hash: &H256) -> Option<TransactionAddress> {
let result = self.db.read_with_cache(DB_COL_EXTRA, &self.transaction_addresses, hash); let result = self.db.read_with_cache(DB_COL_EXTRA, &self.transaction_addresses, hash);
self.note_used(CacheID::TransactionAddresses(hash.clone())); self.cache_man.lock().note_used(CacheID::TransactionAddresses(hash.clone()));
result result
} }
/// Get receipts of block with given hash. /// Get receipts of block with given hash.
fn block_receipts(&self, hash: &H256) -> Option<BlockReceipts> { fn block_receipts(&self, hash: &H256) -> Option<BlockReceipts> {
let result = self.db.read_with_cache(DB_COL_EXTRA, &self.block_receipts, hash); let result = self.db.read_with_cache(DB_COL_EXTRA, &self.block_receipts, hash);
self.note_used(CacheID::BlockReceipts(hash.clone())); self.cache_man.lock().note_used(CacheID::BlockReceipts(hash.clone()));
result result
} }
@ -340,7 +340,7 @@ impl BlockChain {
blocks_blooms: RwLock::new(HashMap::new()), blocks_blooms: RwLock::new(HashMap::new()),
block_receipts: RwLock::new(HashMap::new()), block_receipts: RwLock::new(HashMap::new()),
db: db.clone(), db: db.clone(),
cache_man: RwLock::new(cache_man), cache_man: Mutex::new(cache_man),
pending_best_block: RwLock::new(None), pending_best_block: RwLock::new(None),
pending_block_hashes: RwLock::new(HashMap::new()), pending_block_hashes: RwLock::new(HashMap::new()),
pending_transaction_addresses: RwLock::new(HashMap::new()), pending_transaction_addresses: RwLock::new(HashMap::new()),
@ -647,7 +647,7 @@ impl BlockChain {
let mut write_details = self.block_details.write(); let mut write_details = self.block_details.write();
batch.extend_with_cache(DB_COL_EXTRA, &mut *write_details, update, CacheUpdatePolicy::Overwrite); batch.extend_with_cache(DB_COL_EXTRA, &mut *write_details, update, CacheUpdatePolicy::Overwrite);
self.note_used(CacheID::BlockDetails(block_hash)); self.cache_man.lock().note_used(CacheID::BlockDetails(block_hash));
self.db.write(batch).unwrap(); self.db.write(batch).unwrap();
} }
@ -744,8 +744,9 @@ impl BlockChain {
let mut write_details = self.block_details.write(); let mut write_details = self.block_details.write();
batch.extend_with_cache(DB_COL_EXTRA, &mut *write_details, update.block_details, CacheUpdatePolicy::Overwrite); batch.extend_with_cache(DB_COL_EXTRA, &mut *write_details, update.block_details, CacheUpdatePolicy::Overwrite);
for hash in block_hashes.into_iter() { let mut cache_man = self.cache_man.lock();
self.note_used(CacheID::BlockDetails(hash)); for hash in block_hashes {
cache_man.note_used(CacheID::BlockDetails(hash));
} }
} }
@ -804,12 +805,13 @@ impl BlockChain {
write_hashes.extend(mem::replace(&mut *pending_write_hashes, HashMap::new())); write_hashes.extend(mem::replace(&mut *pending_write_hashes, HashMap::new()));
write_txs.extend(mem::replace(&mut *pending_write_txs, HashMap::new())); write_txs.extend(mem::replace(&mut *pending_write_txs, HashMap::new()));
for n in pending_hashes_keys.into_iter() { let mut cache_man = self.cache_man.lock();
self.note_used(CacheID::BlockHashes(n)); for n in pending_hashes_keys {
cache_man.note_used(CacheID::BlockHashes(n));
} }
for hash in pending_txs_keys.into_iter() { for hash in pending_txs_keys {
self.note_used(CacheID::TransactionAddresses(hash)); cache_man.note_used(CacheID::TransactionAddresses(hash));
} }
} }
@ -1007,12 +1009,6 @@ impl BlockChain {
} }
} }
/// Let the cache system know that a cacheable item has been used.
fn note_used(&self, id: CacheID) {
let mut cache_man = self.cache_man.write();
cache_man.note_used(id);
}
/// Ticks our cache system and throws out any old data. /// Ticks our cache system and throws out any old data.
pub fn collect_garbage(&self) { pub fn collect_garbage(&self) {
let current_size = self.cache_size().total(); let current_size = self.cache_size().total();
@ -1025,7 +1021,7 @@ impl BlockChain {
let mut blocks_blooms = self.blocks_blooms.write(); let mut blocks_blooms = self.blocks_blooms.write();
let mut block_receipts = self.block_receipts.write(); let mut block_receipts = self.block_receipts.write();
let mut cache_man = self.cache_man.write(); let mut cache_man = self.cache_man.lock();
cache_man.collect_garbage(current_size, | ids | { cache_man.collect_garbage(current_size, | ids | {
for id in &ids { for id in &ids {
match *id { match *id {