From a0fb9de5150a5cae5514f09758656f3bd7f726e2 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Wed, 1 Jan 2020 10:51:51 -0700 Subject: [PATCH] Move thread_mem_usage module into measure/ --- Cargo.lock | 6 ++++-- core/Cargo.toml | 4 ---- core/src/banking_stage.rs | 4 ++-- core/src/cluster_info.rs | 2 +- core/src/fetch_stage.rs | 2 +- core/src/lib.rs | 8 -------- core/src/replay_stage.rs | 2 +- core/src/streamer.rs | 3 ++- measure/Cargo.toml | 6 ++++++ measure/src/lib.rs | 8 ++++++++ {core => measure}/src/thread_mem_usage.rs | 0 11 files changed, 25 insertions(+), 20 deletions(-) rename {core => measure}/src/thread_mem_usage.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 87a44e025..658ae59e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3364,8 +3364,6 @@ dependencies = [ "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "jemalloc-ctl 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "jemallocator 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-derive 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-http-server 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3722,6 +3720,10 @@ dependencies = [ name = "solana-measure" version = "0.23.0" dependencies = [ + "jemalloc-ctl 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "jemallocator 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-metrics 0.23.0", "solana-sdk 0.23.0", ] diff --git a/core/Cargo.toml b/core/Cargo.toml index 4d76adda9..6845b61d4 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -73,10 +73,6 @@ untrusted = "0.7.0" solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.23.0" } reed-solomon-erasure = { package = "solana-reed-solomon-erasure", version = "4.0.1-3", features = ["simd-accel"] } -[target."cfg(unix)".dependencies] -jemallocator = "0.3.2" -jemalloc-ctl = "0.3.2" - [dev-dependencies] hex-literal = "0.2.1" matches = "0.1.6" diff --git a/core/src/banking_stage.rs b/core/src/banking_stage.rs index 2eaa95272..1cf3c9bc8 100644 --- a/core/src/banking_stage.rs +++ b/core/src/banking_stage.rs @@ -6,7 +6,7 @@ use crate::{ packet::{limited_deserialize, Packet, Packets, PACKETS_PER_BATCH}, poh_recorder::{PohRecorder, PohRecorderError, WorkingBankEntry}, poh_service::PohService, - thread_mem_usage, + result::{Error, Result}, }; use crossbeam_channel::{Receiver as CrossbeamReceiver, RecvTimeoutError}; use itertools::Itertools; @@ -16,7 +16,7 @@ use solana_ledger::{ entry::hash_transactions, leader_schedule_cache::LeaderScheduleCache, }; -use solana_measure::measure::Measure; +use solana_measure::{measure::Measure, thread_mem_usage}; use solana_metrics::{inc_new_counter_debug, inc_new_counter_info, inc_new_counter_warn}; use solana_perf::{cuda_runtime::PinnedVec, perf_libs}; use solana_runtime::{ diff --git a/core/src/cluster_info.rs b/core/src/cluster_info.rs index 0145e0067..8074fe7d3 100644 --- a/core/src/cluster_info.rs +++ b/core/src/cluster_info.rs @@ -24,7 +24,6 @@ use crate::{ repair_service::RepairType, result::{Error, Result}, sendmmsg::{multicast, send_mmsg}, - thread_mem_usage, weighted_shuffle::{weighted_best, weighted_shuffle}, }; use bincode::{serialize, serialized_size}; @@ -32,6 +31,7 @@ use core::cmp; use itertools::Itertools; use rand::{thread_rng, Rng}; use solana_ledger::{bank_forks::BankForks, blocktree::Blocktree, staking_utils}; +use solana_measure::thread_mem_usage; use solana_metrics::{datapoint_debug, inc_new_counter_debug, inc_new_counter_error}; use solana_net_utils::{ bind_common, bind_common_in_range, bind_in_range, find_available_port_in_range, diff --git a/core/src/fetch_stage.rs b/core/src/fetch_stage.rs index 8dd495c1d..aeff431aa 100644 --- a/core/src/fetch_stage.rs +++ b/core/src/fetch_stage.rs @@ -5,7 +5,7 @@ use crate::packet::PacketsRecycler; use crate::poh_recorder::PohRecorder; use crate::result::{Error, Result}; use crate::streamer::{self, PacketReceiver, PacketSender}; -use crate::thread_mem_usage; +use solana_measure::thread_mem_usage; use solana_metrics::{inc_new_counter_debug, inc_new_counter_info}; use solana_perf::recycler::Recycler; use solana_sdk::clock::DEFAULT_TICKS_PER_SLOT; diff --git a/core/src/lib.rs b/core/src/lib.rs index faedb4ea1..9639978f8 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -12,7 +12,6 @@ pub mod chacha_cuda; pub mod cluster_info_vote_listener; pub mod commitment; pub mod shred_fetch_stage; -pub mod thread_mem_usage; #[macro_use] pub mod contact_info; pub mod archiver; @@ -84,10 +83,3 @@ extern crate solana_metrics; #[cfg(test)] #[macro_use] extern crate matches; - -#[cfg(unix)] -extern crate jemallocator; - -#[cfg(unix)] -#[global_allocator] -static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; diff --git a/core/src/replay_stage.rs b/core/src/replay_stage.rs index 094cfd5d5..5a55d5f43 100644 --- a/core/src/replay_stage.rs +++ b/core/src/replay_stage.rs @@ -7,7 +7,6 @@ use crate::{ poh_recorder::PohRecorder, result::{Error, Result}, rpc_subscriptions::RpcSubscriptions, - thread_mem_usage, }; use solana_ledger::entry::EntryVerificationStatus; use solana_ledger::{ @@ -20,6 +19,7 @@ use solana_ledger::{ snapshot_package::SnapshotPackageSender, }; use solana_measure::measure::Measure; +use solana_measure::thread_mem_usage; use solana_metrics::inc_new_counter_info; use solana_runtime::bank::Bank; use solana_sdk::{ diff --git a/core/src/streamer.rs b/core/src/streamer.rs index be67fcdfc..650ae746c 100644 --- a/core/src/streamer.rs +++ b/core/src/streamer.rs @@ -3,7 +3,8 @@ use crate::packet::{self, send_to, Packets, PacketsRecycler, PACKETS_PER_BATCH}; use crate::recvmmsg::NUM_RCVMMSGS; -use crate::thread_mem_usage; +use crate::result::{Error, Result}; +use solana_measure::thread_mem_usage; use solana_sdk::timing::duration_as_ms; use std::net::UdpSocket; use std::sync::atomic::{AtomicBool, Ordering}; diff --git a/measure/Cargo.toml b/measure/Cargo.toml index 8ce6aaa09..51730d5d4 100644 --- a/measure/Cargo.toml +++ b/measure/Cargo.toml @@ -11,4 +11,10 @@ license = "Apache-2.0" edition = "2018" [dependencies] +log = "0.4.8" solana-sdk = { path = "../sdk", version = "0.23.0" } +solana-metrics = { path = "../metrics", version = "0.23.0" } + +[target."cfg(unix)".dependencies] +jemallocator = "0.3.2" +jemalloc-ctl = "0.3.2" diff --git a/measure/src/lib.rs b/measure/src/lib.rs index a669b0089..d2848c956 100644 --- a/measure/src/lib.rs +++ b/measure/src/lib.rs @@ -1 +1,9 @@ pub mod measure; +pub mod thread_mem_usage; + +#[cfg(unix)] +extern crate jemallocator; + +#[cfg(unix)] +#[global_allocator] +static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; diff --git a/core/src/thread_mem_usage.rs b/measure/src/thread_mem_usage.rs similarity index 100% rename from core/src/thread_mem_usage.rs rename to measure/src/thread_mem_usage.rs