convert std::sync::mpsc to crossbeam_channel (#22264)

This commit is contained in:
Jeff Biseda
2022-01-11 02:44:46 -08:00
committed by GitHub
parent 3c44d405c7
commit 8b66625c95
81 changed files with 313 additions and 346 deletions

View File

@@ -10,6 +10,7 @@ documentation = "https://docs.rs/solana-streamer"
edition = "2021"
[dependencies]
crossbeam-channel = "0.5"
histogram = "0.6.9"
itertools = "0.10.3"
log = "0.4.14"

View File

@@ -7,6 +7,7 @@ use {
recvmmsg::NUM_RCVMMSGS,
socket::SocketAddrSpace,
},
crossbeam_channel::{Receiver, RecvTimeoutError, SendError, Sender},
histogram::Histogram,
solana_sdk::{packet::Packet, timing::timestamp},
std::{
@@ -15,7 +16,6 @@ use {
net::{IpAddr, UdpSocket},
sync::{
atomic::{AtomicBool, Ordering},
mpsc::{Receiver, RecvTimeoutError, SendError, Sender},
Arc,
},
thread::{Builder, JoinHandle},
@@ -324,6 +324,7 @@ mod test {
packet::{Packet, PacketBatch, PACKET_DATA_SIZE},
streamer::{receiver, responder},
},
crossbeam_channel::unbounded,
solana_perf::recycler::Recycler,
std::{
io,
@@ -331,7 +332,6 @@ mod test {
net::UdpSocket,
sync::{
atomic::{AtomicBool, Ordering},
mpsc::channel,
Arc,
},
time::Duration,
@@ -366,7 +366,7 @@ mod test {
let addr = read.local_addr().unwrap();
let send = UdpSocket::bind("127.0.0.1:0").expect("bind");
let exit = Arc::new(AtomicBool::new(false));
let (s_reader, r_reader) = channel();
let (s_reader, r_reader) = unbounded();
let t_receiver = receiver(
Arc::new(read),
&exit,
@@ -377,7 +377,7 @@ mod test {
true,
);
let t_responder = {
let (s_responder, r_responder) = channel();
let (s_responder, r_responder) = unbounded();
let t_responder = responder(
"streamer_send_test",
Arc::new(send),