From 24c43513a64a9795129c35ee95c6e1db30012f2b Mon Sep 17 00:00:00 2001
From: Andronik Ordian <write@reusable.software>
Date: Thu, 7 Jun 2018 17:48:01 +0300
Subject: [PATCH] Use system allocator when profiling memory (#8831)

---
 Cargo.toml    |  7 +++++++
 parity/lib.rs | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index 7795fb3b3..8df37d594 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -98,6 +98,13 @@ slow-blocks = ["ethcore/slow-blocks"]
 secretstore = ["ethcore-secretstore"]
 final = ["parity-version/final"]
 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]
 path = "parity/lib.rs"
diff --git a/parity/lib.rs b/parity/lib.rs
index 8c3242afb..5d0c80289 100644
--- a/parity/lib.rs
+++ b/parity/lib.rs
@@ -17,6 +17,7 @@
 //! Ethcore client application.
 
 #![warn(missing_docs)]
+#![cfg_attr(feature = "memory_profiling", feature(alloc_system, global_allocator, allocator_api))]
 
 extern crate ansi_term;
 extern crate docopt;
@@ -91,6 +92,9 @@ extern crate pretty_assertions;
 #[cfg(test)]
 extern crate tempdir;
 
+#[cfg(feature = "memory_profiling")]
+extern crate alloc_system;
+
 mod account;
 mod blockchain;
 mod cache;
@@ -125,10 +129,16 @@ use cli::Args;
 use configuration::{Cmd, Execute};
 use deprecated::find_deprecated;
 use ethcore_logger::setup_log;
+#[cfg(feature = "memory_profiling")]
+use alloc_system::System;
 
 pub use self::configuration::Configuration;
 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> {
 	if let Some(file) = maybe_file {
 		let mut f = BufReader::new(File::open(&file).map_err(|_| "Unable to open file".to_owned())?);