From 48ce14064d355ad0ed89e59b1d4b10256c85be6a Mon Sep 17 00:00:00 2001 From: Eskil Q Date: Fri, 25 Dec 2020 15:24:19 +0100 Subject: initial tokio 1.0 commit --- mumd/src/network/tcp.rs | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) (limited to 'mumd/src/network/tcp.rs') diff --git a/mumd/src/network/tcp.rs b/mumd/src/network/tcp.rs index b1743c8..9024ef3 100644 --- a/mumd/src/network/tcp.rs +++ b/mumd/src/network/tcp.rs @@ -17,8 +17,9 @@ use std::sync::{Arc, Mutex}; use tokio::net::TcpStream; use tokio::sync::{mpsc, oneshot, watch}; use tokio::time::{self, Duration}; -use tokio_tls::{TlsConnector, TlsStream}; +use tokio_native_tls::{TlsConnector, TlsStream}; use tokio_util::codec::{Decoder, Framed}; +// use tokio_util::codec::decoder::Decoder; type TcpSender = SplitSink< Framed, ControlCodec>, @@ -48,16 +49,22 @@ pub async fn handle( mut tcp_event_register_receiver: mpsc::UnboundedReceiver<(TcpEvent, TcpEventCallback)>, ) { loop { - let connection_info = loop { - match connection_info_receiver.recv().await { - None => { - return; - } - Some(None) => {} - Some(Some(connection_info)) => { - break connection_info; + let connection_info = 'data: loop { + while let Ok(()) = connection_info_receiver.changed().await { + if let Some(data) = connection_info_receiver.borrow().clone() { + break 'data data; } } + return; + // match connection_info_receiver.changed().await { + // None => { + // return; + // } + // Some(None) => {} + // Some(Some(connection_info)) => { + // break connection_info; + // } + // } }; let (mut sink, stream) = connect( connection_info.socket_addr, @@ -165,7 +172,7 @@ async fn send_packets( }, || async { //clears queue of remaining packets - while packet_receiver.borrow_mut().try_recv().is_ok() {} + // while packet_receiver.borrow_mut().try_recv().is_ok() {} sink.borrow_mut().close().await.unwrap(); }, @@ -323,10 +330,16 @@ async fn run_until_disconnection( { let (tx, rx) = oneshot::channel(); let phase_transition_block = async { - while !matches!( - phase_watcher.recv().await.unwrap(), - StatePhase::Disconnected - ) {} + loop { + phase_watcher.changed().await.unwrap(); + if matches!(*phase_watcher.borrow(), StatePhase::Disconnected) { + break; + } + } + // while !matches!( + // phase_watcher.recv().await.unwrap(), + // StatePhase::Disconnected + // ) {} tx.send(true).unwrap(); }; -- cgit v1.2.1 From 4758e817b1372d1e7764f84981b1651436aac1fd Mon Sep 17 00:00:00 2001 From: Eskil Q Date: Fri, 25 Dec 2020 15:27:04 +0100 Subject: solve compiler warnings --- mumd/src/network/tcp.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mumd/src/network/tcp.rs') diff --git a/mumd/src/network/tcp.rs b/mumd/src/network/tcp.rs index 9024ef3..f79655a 100644 --- a/mumd/src/network/tcp.rs +++ b/mumd/src/network/tcp.rs @@ -222,7 +222,7 @@ async fn listen( } ControlPacket::ServerSync(msg) => { info!("Logged in"); - if let Some(mut sender) = crypt_state_sender.borrow_mut().take() { + if let Some(sender) = crypt_state_sender.borrow_mut().take() { let _ = sender .send( crypt_state -- cgit v1.2.1 From 01e0cecb52ed6f33ca2003441646afb538304c89 Mon Sep 17 00:00:00 2001 From: Eskil Q Date: Fri, 25 Dec 2020 22:10:52 +0100 Subject: remove dead code --- mumd/src/network/tcp.rs | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'mumd/src/network/tcp.rs') diff --git a/mumd/src/network/tcp.rs b/mumd/src/network/tcp.rs index f79655a..c1d7a54 100644 --- a/mumd/src/network/tcp.rs +++ b/mumd/src/network/tcp.rs @@ -19,7 +19,6 @@ use tokio::sync::{mpsc, oneshot, watch}; use tokio::time::{self, Duration}; use tokio_native_tls::{TlsConnector, TlsStream}; use tokio_util::codec::{Decoder, Framed}; -// use tokio_util::codec::decoder::Decoder; type TcpSender = SplitSink< Framed, ControlCodec>, @@ -56,15 +55,6 @@ pub async fn handle( } } return; - // match connection_info_receiver.changed().await { - // None => { - // return; - // } - // Some(None) => {} - // Some(Some(connection_info)) => { - // break connection_info; - // } - // } }; let (mut sink, stream) = connect( connection_info.socket_addr, @@ -171,9 +161,6 @@ async fn send_packets( sink.borrow_mut().send(packet).await.unwrap(); }, || async { - //clears queue of remaining packets - // while packet_receiver.borrow_mut().try_recv().is_ok() {} - sink.borrow_mut().close().await.unwrap(); }, phase_watcher, @@ -336,10 +323,6 @@ async fn run_until_disconnection( break; } } - // while !matches!( - // phase_watcher.recv().await.unwrap(), - // StatePhase::Disconnected - // ) {} tx.send(true).unwrap(); }; -- cgit v1.2.1 From 8335bd3b6ca5b87f23aa191722e04fe1c78acc79 Mon Sep 17 00:00:00 2001 From: Eskil Q Date: Sat, 26 Dec 2020 07:46:37 +0100 Subject: minor code cleanup --- mumd/src/network/tcp.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mumd/src/network/tcp.rs') diff --git a/mumd/src/network/tcp.rs b/mumd/src/network/tcp.rs index c1d7a54..3c96ee1 100644 --- a/mumd/src/network/tcp.rs +++ b/mumd/src/network/tcp.rs @@ -49,7 +49,7 @@ pub async fn handle( ) { loop { let connection_info = 'data: loop { - while let Ok(()) = connection_info_receiver.changed().await { + while connection_info_receiver.changed().await.is_ok() { if let Some(data) = connection_info_receiver.borrow().clone() { break 'data data; } -- cgit v1.2.1