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

Rearrange journaldb infrastructure.

Browse Source
This commit is contained in:
Gav Wood
2016-03-11 13:50:39 +01:00
parent 2a856a13f0
commit 4771fdf0fb
6 changed files with 571 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ethcore/src/block_queue.rs
View File

@@ -412,6 +412,7 @@ impl BlockQueue {
}
}
/// Optimise memory footprint of the heap fields.
pub fn collect_garbage(&self) {
{
self.verification.unverified.lock().unwrap().shrink_to_fit();

10
ethcore/src/client/client.rs
View File

@@ -139,8 +139,14 @@ impl<V> Client<V> where V: Verifier {
state_path.push("state");
let engine = Arc::new(try!(spec.to_engine()));
let mut state_db = Box::new(OptionOneDB::from_prefs(state_path.to_str().unwrap(), config.prefer_journal));
if state_db.is_empty() && engine.spec().ensure_db_good(state_db.deref_mut()) {
let state_path_str = state_path.to_str().unwrap();
let mut state_db = if config.prefer_journal {
new_optiononedb(state_path_str)
} else {
new_archivedb(state_path_str)
};
if state_db.is_empty() && engine.spec().ensure_db_good(state_db.as_hashdb_mut()) {
state_db.commit(0, &engine.spec().genesis_header().hash(), None).expect("Error commiting genesis state to state DB");
}