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

Merge pull request #6772 from paritytech/refactoring/cache-6693

Browse Source 
Refactoring/cache 6693
This commit is contained in:
Marek Kotewicz 2017-10-16 09:58:48 +02:00 committed by GitHub
commit d1c9acf439
15 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock generated
View File

@ -606,6 +606,7 @@ dependencies = [
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"macros 0.1.0",
"memory-cache 0.1.0",
"memorydb 0.1.0",
"migration 0.1.0",
"native-contracts 0.1.0",
@ -759,6 +760,7 @@ dependencies = [
"itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
"kvdb 0.1.0",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"memory-cache 0.1.0",
"memorydb 0.1.0",
"parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"patricia_trie 0.1.0",
@ -901,7 +903,6 @@ dependencies = [
"kvdb 0.1.0",
"libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"memorydb 0.1.0",
"parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"patricia_trie 0.1.0",
@ -1047,6 +1048,7 @@ dependencies = [
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"memory-cache 0.1.0",
"parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"vm 0.1.0",
@ -1645,6 +1647,14 @@ dependencies = [
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "memory-cache"
version = "0.1.0"
dependencies = [
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "memorydb"
version = "0.1.0"

1
ethcore/Cargo.toml
View File

@ -32,6 +32,7 @@ ethcore-logger = { path = "../logger" }
ethcore-stratum = { path = "../stratum" }
ethcore-util = { path = "../util" }
ethcore-bigint = { path = "../util/bigint" }
memory-cache = { path = "../util/memory_cache" }
ethjson = { path = "../json" }
ethkey = { path = "../ethkey" }
ethstore = { path = "../ethstore" }

1
ethcore/evm/Cargo.toml
View File

@ -14,6 +14,7 @@ log = "0.3"
vm = { path = "../vm" }
hash = { path = "../../util/hash" }
parking_lot = "0.4"
memory-cache = { path = "../../util/memory_cache" }
[dev-dependencies]
rustc-hex = "1.0"

2
ethcore/evm/src/interpreter/shared_cache.rs
View File

@ -19,7 +19,7 @@ use hash::KECCAK_EMPTY;
use heapsize::HeapSizeOf;
use bigint::hash::H256;
use parking_lot::Mutex;
use util::cache::MemoryLruCache;
use memory_cache::MemoryLruCache;
use bit_set::BitSet;
use super::super::instructions;

1
ethcore/evm/src/lib.rs
View File

@ -23,6 +23,7 @@ extern crate parking_lot;
extern crate heapsize;
extern crate vm;
extern crate hash;
extern crate memory_cache;
#[macro_use]
extern crate lazy_static;

1
ethcore/light/Cargo.toml
View File

@ -40,6 +40,7 @@ stats = { path = "../../util/stats" }
hash = { path = "../../util/hash" }
triehash = { path = "../../util/triehash" }
kvdb = { path = "../../util/kvdb" }
memory-cache = { path = "../../util/memory_cache" }
[features]
default = []

2
ethcore/light/src/cache.rs
View File

@ -29,7 +29,7 @@ use time::{SteadyTime, Duration};
use heapsize::HeapSizeOf;
use bigint::prelude::U256;
use bigint::hash::H256;
use util::cache::MemoryLruCache;
use memory_cache::MemoryLruCache;
/// Configuration for how much data to cache.
#[derive(Debug, Clone, PartialEq, Eq)]

1
ethcore/light/src/lib.rs
View File

@ -92,6 +92,7 @@ extern crate vm;
extern crate hash;
extern crate triehash;
extern crate kvdb;
extern crate memory_cache;
#[cfg(feature = "ipc")]
extern crate ethcore_ipc as ipc;

2
ethcore/src/engines/validator_set/safe_contract.rs
View File

@ -27,7 +27,7 @@ use parking_lot::{Mutex, RwLock};
use util::*;
use bytes::Bytes;
use util::cache::MemoryLruCache;
use memory_cache::MemoryLruCache;
use unexpected::Mismatch;
use rlp::{UntrustedRlp, RlpStream};

1
ethcore/src/lib.rs
View File

@ -129,6 +129,7 @@ extern crate bloomable;
extern crate vm;
extern crate wasm;
extern crate ethcore_util as util;
extern crate memory_cache;
#[macro_use]
extern crate macros;

2
ethcore/src/state_db.rs
View File

@ -17,7 +17,7 @@
use std::collections::{VecDeque, HashSet};
use std::sync::Arc;
use lru_cache::LruCache;
use util::cache::MemoryLruCache;
use memory_cache::MemoryLruCache;
use util::journaldb::JournalDB;
use kvdb::{KeyValueDB, DBTransaction};
use bigint::hash::H256;

1
util/Cargo.toml
View File

@ -24,7 +24,6 @@ target_info = "0.1"
ethcore-bigint = { path = "bigint", features = ["heapsizeof"] }
parking_lot = "0.4"
tiny-keccak= "1.0"
lru-cache = "0.1.0"
ethcore-logger = { path = "../logger" }
triehash = { path = "triehash" }
error-chain = "0.11.0-rc.2"

10
util/memory_cache/Cargo.toml Normal file
View File

@ -0,0 +1,10 @@
[package]
name = "memory-cache"
version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]
description = "An LRU-cache which operates on memory used"
license = "GPL3"
[dependencies]
heapsize = "0.4"
lru-cache = "0.1"

3
util/src/cache.rs → util/memory_cache/src/lib.rs
View File

@ -18,6 +18,9 @@
//! crate.
// TODO: push changes upstream in a clean way.
extern crate heapsize;
extern crate lru_cache;
use heapsize::HeapSizeOf;
use lru_cache::LruCache;

2
util/src/lib.rs
View File

@ -100,7 +100,6 @@ extern crate ethcore_bytes as bytes;
extern crate parking_lot;
extern crate tiny_keccak;
extern crate rlp;
extern crate lru_cache;
extern crate heapsize;
extern crate ethcore_logger;
extern crate hash as keccak;
@ -116,7 +115,6 @@ extern crate log as rlog;
pub mod misc;
pub mod overlaydb;
pub mod journaldb;
pub mod cache;
pub use misc::*;
pub use hashdb::*;