mirrors/electrs
1
0
Fork 0
mirror of https://github.com/romanz/electrs.git synced 2025-02-24 15:02:21 +01:00
Code Issues Projects Releases Wiki Activity

Use an Arc<TcpStream> instead of cloning in p2p.rs

Browse source
This commit is contained in:
Roman Zeyde 2021-10-15 18:44:43 +03:00
parent cf0acfb6aa
commit c38341f9ab
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/p2p.rs
View file

@ -17,6 +17,7 @@ use crossbeam_channel::{bounded, select, Receiver, Sender};
use std::io::{self, ErrorKind, Write};
use std::net::{IpAddr, Ipv4Addr, SocketAddr, TcpStream};
use std::sync::Arc;
use std::time::{SystemTime, UNIX_EPOCH};
use crate::{
@ -127,8 +128,10 @@ impl Connection {
address: SocketAddr,
metrics: &Metrics,
) -> Result<Self> {
let mut stream = TcpStream::connect(address)
.with_context(|| format!("{} p2p failed to connect: {:?}", network, address))?;
let conn = Arc::new(
TcpStream::connect(address)
.with_context(|| format!("{} p2p failed to connect: {:?}", network, address))?,
);
let (tx_send, tx_recv) = bounded::<NetworkMessage>(1);
let (rx_send, rx_recv) = bounded::<NetworkMessage>(1);
@ -158,8 +161,7 @@ impl Connection {
default_duration_buckets(),
);
let mut reader = stream.try_clone().context("stream failed to clone")?;
let stream = Arc::clone(&conn);
crate::thread::spawn("p2p_send", move || loop {
use std::net::Shutdown;
let msg = match send_duration.observe_duration("wait", || tx_recv.recv()) {
@ -180,15 +182,16 @@ impl Connection {
magic: network.magic(),
payload: msg,
};
stream
(&*stream)
.write_all(encode::serialize(&raw_msg).as_slice())
.context("p2p failed to send")
})?;
});
let stream = Arc::clone(&conn);
crate::thread::spawn("p2p_recv", move || loop {
let raw_msg = match recv_duration
.observe_duration("recv", || RawNetworkMessage::consensus_decode(&mut reader))
.observe_duration("recv", || RawNetworkMessage::consensus_decode(&*stream))
{
Ok(raw_msg) => {
assert_eq!(raw_msg.magic, network.magic());