This commit is contained in:
Trent Nelson
2022-02-24 14:09:25 -07:00
committed by mergify[bot]
parent 97b5a71ceb
commit d4292774c5
6 changed files with 11 additions and 10 deletions

View File

@ -110,7 +110,7 @@ fn generate_chunked_transfers(
shared_txs: &SharedTransactions, shared_txs: &SharedTransactions,
shared_tx_active_thread_count: Arc<AtomicIsize>, shared_tx_active_thread_count: Arc<AtomicIsize>,
source_keypair_chunks: Vec<Vec<&Keypair>>, source_keypair_chunks: Vec<Vec<&Keypair>>,
dest_keypair_chunks: &mut Vec<VecDeque<&Keypair>>, dest_keypair_chunks: &mut [VecDeque<&Keypair>],
threads: usize, threads: usize,
duration: Duration, duration: Duration,
sustained: bool, sustained: bool,

View File

@ -2715,7 +2715,8 @@ mod test {
stake stake
); );
} }
for slot in &[17] { {
let slot = &17;
assert_eq!( assert_eq!(
tree1 tree1
.stake_voted_subtree(&(*slot, Hash::default())) .stake_voted_subtree(&(*slot, Hash::default()))

View File

@ -642,7 +642,7 @@ impl RepairWeight {
} }
// Heavier, smaller slots come first // Heavier, smaller slots come first
fn sort_by_stake_weight_slot(slot_stake_voted: &mut Vec<(Slot, u64)>) { fn sort_by_stake_weight_slot(slot_stake_voted: &mut [(Slot, u64)]) {
slot_stake_voted.sort_by(|(slot, stake_voted), (slot_, stake_voted_)| { slot_stake_voted.sort_by(|(slot, stake_voted), (slot_, stake_voted_)| {
if stake_voted == stake_voted_ { if stake_voted == stake_voted_ {
slot.cmp(slot_) slot.cmp(slot_)

View File

@ -507,7 +507,7 @@ impl Deduper {
} }
//inplace shrink a batch of packets //inplace shrink a batch of packets
pub fn shrink_batches(batches: &mut Vec<PacketBatch>) -> usize { pub fn shrink_batches(batches: &mut [PacketBatch]) -> usize {
let mut valid_batch_ix = 0; let mut valid_batch_ix = 0;
let mut valid_packet_ix = 0; let mut valid_packet_ix = 0;
let mut last_valid_batch = 0; let mut last_valid_batch = 0;
@ -570,7 +570,7 @@ pub fn ed25519_verify_disabled(batches: &mut [PacketBatch]) {
inc_new_counter_debug!("ed25519_verify_disabled", packet_count); inc_new_counter_debug!("ed25519_verify_disabled", packet_count);
} }
pub fn copy_return_values(sig_lens: &[Vec<u32>], out: &PinnedVec<u8>, rvs: &mut Vec<Vec<u8>>) { pub fn copy_return_values(sig_lens: &[Vec<u32>], out: &PinnedVec<u8>, rvs: &mut [Vec<u8>]) {
let mut num = 0; let mut num = 0;
for (vs, sig_vs) in rvs.iter_mut().zip(sig_lens.iter()) { for (vs, sig_vs) in rvs.iter_mut().zip(sig_lens.iter()) {
for (v, sig_v) in vs.iter_mut().zip(sig_vs.iter()) { for (v, sig_v) in vs.iter_mut().zip(sig_vs.iter()) {
@ -1531,9 +1531,9 @@ mod tests {
// No batches // No batches
// truncate of 1 on len 0 is a noop // truncate of 1 on len 0 is a noop
assert_eq!(shrink_batches(&mut vec![]), 0); assert_eq!(shrink_batches(&mut []), 0);
// One empty batch // One empty batch
assert_eq!(shrink_batches(&mut vec![PacketBatch::with_capacity(0)]), 0); assert_eq!(shrink_batches(&mut [PacketBatch::with_capacity(0)]), 0);
// Many empty batches // Many empty batches
let mut batches = (0..BATCH_COUNT) let mut batches = (0..BATCH_COUNT)
.map(|_| PacketBatch::with_capacity(0)) .map(|_| PacketBatch::with_capacity(0))

View File

@ -2075,7 +2075,7 @@ impl JsonRpcRequestProcessor {
} }
} }
fn optimize_filters(filters: &mut Vec<RpcFilterType>) { fn optimize_filters(filters: &mut [RpcFilterType]) {
filters.iter_mut().for_each(|filter_type| { filters.iter_mut().for_each(|filter_type| {
if let RpcFilterType::Memcmp(compare) = filter_type { if let RpcFilterType::Memcmp(compare) = filter_type {
use MemcmpEncodedBytes::*; use MemcmpEncodedBytes::*;

View File

@ -84,12 +84,12 @@ fn mmsghdr_for_packet(
} }
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
fn sendmmsg_retry(sock: &UdpSocket, hdrs: &mut Vec<mmsghdr>) -> Result<(), SendPktsError> { fn sendmmsg_retry(sock: &UdpSocket, hdrs: &mut [mmsghdr]) -> Result<(), SendPktsError> {
let sock_fd = sock.as_raw_fd(); let sock_fd = sock.as_raw_fd();
let mut total_sent = 0; let mut total_sent = 0;
let mut erropt = None; let mut erropt = None;
let mut pkts = &mut hdrs[..]; let mut pkts = &mut *hdrs;
while !pkts.is_empty() { while !pkts.is_empty() {
let npkts = match unsafe { libc::sendmmsg(sock_fd, &mut pkts[0], pkts.len() as u32, 0) } { let npkts = match unsafe { libc::sendmmsg(sock_fd, &mut pkts[0], pkts.len() as u32, 0) } {
-1 => { -1 => {