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

Use system allocator when profiling memory (#8831)

Browse Source
This commit is contained in:
Andronik Ordian 2018-06-07 17:48:01 +03:00 committed by Afri Schoedon
parent a6d267abc0
commit 24c43513a6
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Cargo.toml
View File

@ -98,6 +98,13 @@ slow-blocks = ["ethcore/slow-blocks"]
secretstore = ["ethcore-secretstore"] secretstore = ["ethcore-secretstore"]
final = ["parity-version/final"] final = ["parity-version/final"]
deadlock_detection = ["parking_lot/deadlock_detection"] deadlock_detection = ["parking_lot/deadlock_detection"]
# to create a memory profile (requires nightly rust), use e.g.
# `heaptrack /path/to/parity <parity params>`,
# to visualize a memory profile, use `heaptrack_gui`
# or
# `valgrind --tool=massif /path/to/parity <parity params>`
# and `massif-visualizer` for visualization
memory_profiling = []
[lib] [lib]
path = "parity/lib.rs" path = "parity/lib.rs"

10
parity/lib.rs
View File

@ -17,6 +17,7 @@
//! Ethcore client application. //! Ethcore client application.
#![warn(missing_docs)] #![warn(missing_docs)]
#![cfg_attr(feature = "memory_profiling", feature(alloc_system, global_allocator, allocator_api))]
extern crate ansi_term; extern crate ansi_term;
extern crate docopt; extern crate docopt;
@ -91,6 +92,9 @@ extern crate pretty_assertions;
#[cfg(test)] #[cfg(test)]
extern crate tempdir; extern crate tempdir;
#[cfg(feature = "memory_profiling")]
extern crate alloc_system;
mod account; mod account;
mod blockchain; mod blockchain;
mod cache; mod cache;
@ -125,10 +129,16 @@ use cli::Args;
use configuration::{Cmd, Execute}; use configuration::{Cmd, Execute};
use deprecated::find_deprecated; use deprecated::find_deprecated;
use ethcore_logger::setup_log; use ethcore_logger::setup_log;
#[cfg(feature = "memory_profiling")]
use alloc_system::System;
pub use self::configuration::Configuration; pub use self::configuration::Configuration;
pub use self::run::RunningClient; pub use self::run::RunningClient;
#[cfg(feature = "memory_profiling")]
#[global_allocator]
static A: System = System;
fn print_hash_of(maybe_file: Option<String>) -> Result<String, String> { fn print_hash_of(maybe_file: Option<String>) -> Result<String, String> {
if let Some(file) = maybe_file { if let Some(file) = maybe_file {
let mut f = BufReader::new(File::open(&file).map_err(|_| "Unable to open file".to_owned())?); let mut f = BufReader::new(File::open(&file).map_err(|_| "Unable to open file".to_owned())?);