Move thread_mem_usage module into measure/
This commit is contained in:
parent
5d42dcc9ec
commit
a0fb9de515
|
@ -3364,8 +3364,6 @@ dependencies = [
|
||||||
"hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"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)",
|
"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)",
|
"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-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-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)",
|
"jsonrpc-http-server 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
@ -3722,6 +3720,10 @@ dependencies = [
|
||||||
name = "solana-measure"
|
name = "solana-measure"
|
||||||
version = "0.23.0"
|
version = "0.23.0"
|
||||||
dependencies = [
|
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",
|
"solana-sdk 0.23.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -73,10 +73,6 @@ untrusted = "0.7.0"
|
||||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.23.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"] }
|
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]
|
[dev-dependencies]
|
||||||
hex-literal = "0.2.1"
|
hex-literal = "0.2.1"
|
||||||
matches = "0.1.6"
|
matches = "0.1.6"
|
||||||
|
|
|
@ -6,7 +6,7 @@ use crate::{
|
||||||
packet::{limited_deserialize, Packet, Packets, PACKETS_PER_BATCH},
|
packet::{limited_deserialize, Packet, Packets, PACKETS_PER_BATCH},
|
||||||
poh_recorder::{PohRecorder, PohRecorderError, WorkingBankEntry},
|
poh_recorder::{PohRecorder, PohRecorderError, WorkingBankEntry},
|
||||||
poh_service::PohService,
|
poh_service::PohService,
|
||||||
thread_mem_usage,
|
result::{Error, Result},
|
||||||
};
|
};
|
||||||
use crossbeam_channel::{Receiver as CrossbeamReceiver, RecvTimeoutError};
|
use crossbeam_channel::{Receiver as CrossbeamReceiver, RecvTimeoutError};
|
||||||
use itertools::Itertools;
|
use itertools::Itertools;
|
||||||
|
@ -16,7 +16,7 @@ use solana_ledger::{
|
||||||
entry::hash_transactions,
|
entry::hash_transactions,
|
||||||
leader_schedule_cache::LeaderScheduleCache,
|
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_metrics::{inc_new_counter_debug, inc_new_counter_info, inc_new_counter_warn};
|
||||||
use solana_perf::{cuda_runtime::PinnedVec, perf_libs};
|
use solana_perf::{cuda_runtime::PinnedVec, perf_libs};
|
||||||
use solana_runtime::{
|
use solana_runtime::{
|
||||||
|
|
|
@ -24,7 +24,6 @@ use crate::{
|
||||||
repair_service::RepairType,
|
repair_service::RepairType,
|
||||||
result::{Error, Result},
|
result::{Error, Result},
|
||||||
sendmmsg::{multicast, send_mmsg},
|
sendmmsg::{multicast, send_mmsg},
|
||||||
thread_mem_usage,
|
|
||||||
weighted_shuffle::{weighted_best, weighted_shuffle},
|
weighted_shuffle::{weighted_best, weighted_shuffle},
|
||||||
};
|
};
|
||||||
use bincode::{serialize, serialized_size};
|
use bincode::{serialize, serialized_size};
|
||||||
|
@ -32,6 +31,7 @@ use core::cmp;
|
||||||
use itertools::Itertools;
|
use itertools::Itertools;
|
||||||
use rand::{thread_rng, Rng};
|
use rand::{thread_rng, Rng};
|
||||||
use solana_ledger::{bank_forks::BankForks, blocktree::Blocktree, staking_utils};
|
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_metrics::{datapoint_debug, inc_new_counter_debug, inc_new_counter_error};
|
||||||
use solana_net_utils::{
|
use solana_net_utils::{
|
||||||
bind_common, bind_common_in_range, bind_in_range, find_available_port_in_range,
|
bind_common, bind_common_in_range, bind_in_range, find_available_port_in_range,
|
||||||
|
|
|
@ -5,7 +5,7 @@ use crate::packet::PacketsRecycler;
|
||||||
use crate::poh_recorder::PohRecorder;
|
use crate::poh_recorder::PohRecorder;
|
||||||
use crate::result::{Error, Result};
|
use crate::result::{Error, Result};
|
||||||
use crate::streamer::{self, PacketReceiver, PacketSender};
|
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_metrics::{inc_new_counter_debug, inc_new_counter_info};
|
||||||
use solana_perf::recycler::Recycler;
|
use solana_perf::recycler::Recycler;
|
||||||
use solana_sdk::clock::DEFAULT_TICKS_PER_SLOT;
|
use solana_sdk::clock::DEFAULT_TICKS_PER_SLOT;
|
||||||
|
|
|
@ -12,7 +12,6 @@ pub mod chacha_cuda;
|
||||||
pub mod cluster_info_vote_listener;
|
pub mod cluster_info_vote_listener;
|
||||||
pub mod commitment;
|
pub mod commitment;
|
||||||
pub mod shred_fetch_stage;
|
pub mod shred_fetch_stage;
|
||||||
pub mod thread_mem_usage;
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
pub mod contact_info;
|
pub mod contact_info;
|
||||||
pub mod archiver;
|
pub mod archiver;
|
||||||
|
@ -84,10 +83,3 @@ extern crate solana_metrics;
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate matches;
|
extern crate matches;
|
||||||
|
|
||||||
#[cfg(unix)]
|
|
||||||
extern crate jemallocator;
|
|
||||||
|
|
||||||
#[cfg(unix)]
|
|
||||||
#[global_allocator]
|
|
||||||
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
|
|
||||||
|
|
|
@ -7,7 +7,6 @@ use crate::{
|
||||||
poh_recorder::PohRecorder,
|
poh_recorder::PohRecorder,
|
||||||
result::{Error, Result},
|
result::{Error, Result},
|
||||||
rpc_subscriptions::RpcSubscriptions,
|
rpc_subscriptions::RpcSubscriptions,
|
||||||
thread_mem_usage,
|
|
||||||
};
|
};
|
||||||
use solana_ledger::entry::EntryVerificationStatus;
|
use solana_ledger::entry::EntryVerificationStatus;
|
||||||
use solana_ledger::{
|
use solana_ledger::{
|
||||||
|
@ -20,6 +19,7 @@ use solana_ledger::{
|
||||||
snapshot_package::SnapshotPackageSender,
|
snapshot_package::SnapshotPackageSender,
|
||||||
};
|
};
|
||||||
use solana_measure::measure::Measure;
|
use solana_measure::measure::Measure;
|
||||||
|
use solana_measure::thread_mem_usage;
|
||||||
use solana_metrics::inc_new_counter_info;
|
use solana_metrics::inc_new_counter_info;
|
||||||
use solana_runtime::bank::Bank;
|
use solana_runtime::bank::Bank;
|
||||||
use solana_sdk::{
|
use solana_sdk::{
|
||||||
|
|
|
@ -3,7 +3,8 @@
|
||||||
|
|
||||||
use crate::packet::{self, send_to, Packets, PacketsRecycler, PACKETS_PER_BATCH};
|
use crate::packet::{self, send_to, Packets, PacketsRecycler, PACKETS_PER_BATCH};
|
||||||
use crate::recvmmsg::NUM_RCVMMSGS;
|
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 solana_sdk::timing::duration_as_ms;
|
||||||
use std::net::UdpSocket;
|
use std::net::UdpSocket;
|
||||||
use std::sync::atomic::{AtomicBool, Ordering};
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
|
|
|
@ -11,4 +11,10 @@ license = "Apache-2.0"
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
log = "0.4.8"
|
||||||
solana-sdk = { path = "../sdk", version = "0.23.0" }
|
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"
|
||||||
|
|
|
@ -1 +1,9 @@
|
||||||
pub mod measure;
|
pub mod measure;
|
||||||
|
pub mod thread_mem_usage;
|
||||||
|
|
||||||
|
#[cfg(unix)]
|
||||||
|
extern crate jemallocator;
|
||||||
|
|
||||||
|
#[cfg(unix)]
|
||||||
|
#[global_allocator]
|
||||||
|
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
|
||||||
|
|
Loading…
Reference in New Issue