Reformat imports to a consistent style for imports
rustfmt.toml configuration: imports_granularity = "One" group_imports = "One"
This commit is contained in:
@ -1,17 +1,20 @@
|
||||
//! The `packet` module defines data structures and methods to pull data from the network.
|
||||
use crate::{
|
||||
recvmmsg::{recv_mmsg, NUM_RCVMMSGS},
|
||||
socket::SocketAddrSpace,
|
||||
use {
|
||||
crate::{
|
||||
recvmmsg::{recv_mmsg, NUM_RCVMMSGS},
|
||||
socket::SocketAddrSpace,
|
||||
},
|
||||
solana_metrics::inc_new_counter_debug,
|
||||
std::{io::Result, net::UdpSocket, time::Instant},
|
||||
};
|
||||
pub use solana_perf::packet::{
|
||||
limited_deserialize, to_packets_chunked, Packets, PacketsRecycler, NUM_PACKETS,
|
||||
PACKETS_PER_BATCH,
|
||||
pub use {
|
||||
solana_perf::packet::{
|
||||
limited_deserialize, to_packets_chunked, Packets, PacketsRecycler, NUM_PACKETS,
|
||||
PACKETS_PER_BATCH,
|
||||
},
|
||||
solana_sdk::packet::{Meta, Packet, PACKET_DATA_SIZE},
|
||||
};
|
||||
|
||||
use solana_metrics::inc_new_counter_debug;
|
||||
pub use solana_sdk::packet::{Meta, Packet, PACKET_DATA_SIZE};
|
||||
use std::{io::Result, net::UdpSocket, time::Instant};
|
||||
|
||||
pub fn recv_from(obj: &mut Packets, socket: &UdpSocket, max_wait_ms: u64) -> Result<usize> {
|
||||
let mut i = 0;
|
||||
//DOCUMENTED SIDE-EFFECT
|
||||
@ -73,10 +76,14 @@ pub fn send_to(
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::io;
|
||||
use std::io::Write;
|
||||
use std::net::{SocketAddr, UdpSocket};
|
||||
use {
|
||||
super::*,
|
||||
std::{
|
||||
io,
|
||||
io::Write,
|
||||
net::{SocketAddr, UdpSocket},
|
||||
},
|
||||
};
|
||||
|
||||
#[test]
|
||||
fn test_packets_set_addr() {
|
||||
|
@ -119,10 +119,13 @@ pub fn recv_mmsg(sock: &UdpSocket, packets: &mut [Packet]) -> io::Result<(usize,
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::packet::PACKET_DATA_SIZE;
|
||||
use crate::recvmmsg::*;
|
||||
use std::net::{SocketAddr, UdpSocket};
|
||||
use std::time::{Duration, Instant};
|
||||
use {
|
||||
crate::{packet::PACKET_DATA_SIZE, recvmmsg::*},
|
||||
std::{
|
||||
net::{SocketAddr, UdpSocket},
|
||||
time::{Duration, Instant},
|
||||
},
|
||||
};
|
||||
|
||||
type TestConfig = (UdpSocket, SocketAddr, UdpSocket, SocketAddr);
|
||||
|
||||
|
@ -149,13 +149,17 @@ where
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::packet::Packet;
|
||||
use crate::recvmmsg::recv_mmsg;
|
||||
use crate::sendmmsg::{batch_send, multi_target_send, SendPktsError};
|
||||
use solana_sdk::packet::PACKET_DATA_SIZE;
|
||||
use std::{
|
||||
io::ErrorKind,
|
||||
net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, UdpSocket},
|
||||
use {
|
||||
crate::{
|
||||
packet::Packet,
|
||||
recvmmsg::recv_mmsg,
|
||||
sendmmsg::{batch_send, multi_target_send, SendPktsError},
|
||||
},
|
||||
solana_sdk::packet::PACKET_DATA_SIZE,
|
||||
std::{
|
||||
io::ErrorKind,
|
||||
net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, UdpSocket},
|
||||
},
|
||||
};
|
||||
|
||||
#[test]
|
||||
|
@ -1,19 +1,25 @@
|
||||
//! The `streamer` module defines a set of services for efficiently pulling data from UDP sockets.
|
||||
//!
|
||||
|
||||
use crate::{
|
||||
packet::{self, send_to, Packets, PacketsRecycler, PACKETS_PER_BATCH},
|
||||
recvmmsg::NUM_RCVMMSGS,
|
||||
socket::SocketAddrSpace,
|
||||
use {
|
||||
crate::{
|
||||
packet::{self, send_to, Packets, PacketsRecycler, PACKETS_PER_BATCH},
|
||||
recvmmsg::NUM_RCVMMSGS,
|
||||
socket::SocketAddrSpace,
|
||||
},
|
||||
solana_sdk::timing::timestamp,
|
||||
std::{
|
||||
net::UdpSocket,
|
||||
sync::{
|
||||
atomic::{AtomicBool, Ordering},
|
||||
mpsc::{Receiver, RecvTimeoutError, SendError, Sender},
|
||||
Arc,
|
||||
},
|
||||
thread::{Builder, JoinHandle},
|
||||
time::{Duration, Instant},
|
||||
},
|
||||
thiserror::Error,
|
||||
};
|
||||
use solana_sdk::timing::timestamp;
|
||||
use std::net::UdpSocket;
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::mpsc::{Receiver, RecvTimeoutError, SendError, Sender};
|
||||
use std::sync::Arc;
|
||||
use std::thread::{Builder, JoinHandle};
|
||||
use std::time::{Duration, Instant};
|
||||
use thiserror::Error;
|
||||
|
||||
pub type PacketReceiver = Receiver<Packets>;
|
||||
pub type PacketSender = Sender<Packets>;
|
||||
@ -178,17 +184,25 @@ pub fn responder(
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use super::*;
|
||||
use crate::packet::{Packet, Packets, PACKET_DATA_SIZE};
|
||||
use crate::streamer::{receiver, responder};
|
||||
use solana_perf::recycler::Recycler;
|
||||
use std::io;
|
||||
use std::io::Write;
|
||||
use std::net::UdpSocket;
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::mpsc::channel;
|
||||
use std::sync::Arc;
|
||||
use std::time::Duration;
|
||||
use {
|
||||
super::*,
|
||||
crate::{
|
||||
packet::{Packet, Packets, PACKET_DATA_SIZE},
|
||||
streamer::{receiver, responder},
|
||||
},
|
||||
solana_perf::recycler::Recycler,
|
||||
std::{
|
||||
io,
|
||||
io::Write,
|
||||
net::UdpSocket,
|
||||
sync::{
|
||||
atomic::{AtomicBool, Ordering},
|
||||
mpsc::channel,
|
||||
Arc,
|
||||
},
|
||||
time::Duration,
|
||||
},
|
||||
};
|
||||
|
||||
fn get_msgs(r: PacketReceiver, num: &mut usize) {
|
||||
for _ in 0..10 {
|
||||
|
@ -1,10 +1,12 @@
|
||||
#![cfg(target_os = "linux")]
|
||||
|
||||
use solana_streamer::packet::Packet;
|
||||
use solana_streamer::packet::PACKET_DATA_SIZE;
|
||||
use solana_streamer::recvmmsg::*;
|
||||
use std::net::UdpSocket;
|
||||
use std::time::Instant;
|
||||
use {
|
||||
solana_streamer::{
|
||||
packet::{Packet, PACKET_DATA_SIZE},
|
||||
recvmmsg::*,
|
||||
},
|
||||
std::{net::UdpSocket, time::Instant},
|
||||
};
|
||||
|
||||
#[test]
|
||||
pub fn test_recv_mmsg_batch_size() {
|
||||
|
Reference in New Issue
Block a user