Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-08 12:21:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduce the scope of the chain new block lock (#1666)

Browse source 
When processing a new block, attemps to make the scope of the
corresponding `txhashet` lock as small as possible. The idea is
to avoid bad interactions with orphan locks or block post
processing (i.e. adapter events, etc)
This commit is contained in:
Ignotus Peverell 2018-10-05 12:17:58 -07:00 committed by GitHub
parent 8bb7b5fbb9
commit 7f2e2158c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
chain/src/chain.rs
View file

@ -217,11 +217,19 @@ impl Chain {
/// Returns true if it has been added to the longest chain /// Returns true if it has been added to the longest chain
/// or false if it has added to a fork (or orphan?). /// or false if it has added to a fork (or orphan?).
fn process_block_single(&self, b: Block, opts: Options) -> Result<Option<Tip>, Error> { fn process_block_single(&self, b: Block, opts: Options) -> Result<Option<Tip>, Error> {
let maybe_new_head: Result<Option<Tip>, Error>;
{
let batch = self.store.batch()?; let batch = self.store.batch()?;
let mut txhashset = self.txhashset.write().unwrap(); let mut txhashset = self.txhashset.write().unwrap();
let mut ctx = self.new_ctx(opts, batch, &mut txhashset)?; let mut ctx = self.new_ctx(opts, batch, &mut txhashset)?;
// let hash = b.hash(); maybe_new_head = pipe::process_block(&b, &mut ctx);
if let Ok(_) = maybe_new_head {
ctx.batch.commit()?;
}
// release the lock and let the batch go before post-processing
}
let add_to_hash_cache = |hash: Hash| { let add_to_hash_cache = |hash: Hash| {
// only add to hash cache below if block is definitively accepted // only add to hash cache below if block is definitively accepted
// or rejected // or rejected
@ -229,11 +237,8 @@ impl Chain {
cache.insert(hash, true); cache.insert(hash, true);
}; };
match pipe::process_block(&b, &mut ctx) { match maybe_new_head {
Ok(head) => { Ok(head) => {
// Commit the batch in the ctx to the db.
ctx.batch.commit()?;
add_to_hash_cache(b.hash()); add_to_hash_cache(b.hash());
// notifying other parts of the system of the update // notifying other parts of the system of the update
@ -251,10 +256,6 @@ impl Chain {
added: Instant::now(), added: Instant::now(),
}; };
// In the case of a fork - it is possible to have multiple blocks
// that are children of a given block.
// We do not handle this currently for orphans (future enhancement?).
// We just assume "last one wins" for now.
&self.orphans.add(orphan); &self.orphans.add(orphan);
debug!( debug!(