From 23b536f7717796b642c7ce93749b121cb41b280a Mon Sep 17 00:00:00 2001
From: lubeilin <1791778603@qq.com>
Date: Fri, 1 Mar 2024 23:33:47 +0800
Subject: [PATCH] =?UTF-8?q?[mio]=20=E4=BF=AE=E5=A4=8D=E5=81=9C=E6=AD=A2?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vnt/src/channel/context.rs     | 16 +++++++++++++---
 vnt/src/channel/udp_channel.rs | 22 +++++-----------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/vnt/src/channel/context.rs b/vnt/src/channel/context.rs
index 9a001ab..e0094cc 100644
--- a/vnt/src/channel/context.rs
+++ b/vnt/src/channel/context.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use std::io;
 use std::net::{Ipv4Addr, SocketAddr, SocketAddrV6, UdpSocket};
 use std::ops::Deref;
-use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 
@@ -35,6 +35,7 @@ impl Context {
             tcp_map: RwLock::new(HashMap::with_capacity(64)),
             route_table: RouteTable::new(use_channel_type, first_latency, channel_num),
             is_tcp,
+            state: AtomicBool::new(true),
         };
         Self {
             inner: Arc::new(inner),
@@ -67,9 +68,17 @@ pub struct ContextInner {
     pub route_table: RouteTable,
     // 是否使用tcp连接服务器
     is_tcp: bool,
+    //状态
+    state: AtomicBool,
 }
 
 impl ContextInner {
+    pub fn is_stop(&self) -> bool {
+        !self.state.load(Ordering::Acquire)
+    }
+    pub fn stop(&self) {
+        self.state.store(false, Ordering::Release);
+    }
     /// 通过sub_udp_socket是否为空来判断是否为锥形网络
     pub fn is_cone(&self) -> bool {
         self.sub_udp_socket.read().is_empty()
@@ -272,8 +281,9 @@ impl RouteTable {
                 return Err(io::Error::new(io::ErrorKind::NotFound, "route not found"));
             }
             if self.channel_num > 1 {
-                //多通道的，则轮流使用
-                let index = count.fetch_add(1, Ordering::Relaxed);
+                //多通道的，则轮流使用,不需要精确轮询 不使用cas性能估计好点
+                let index = count.load(Ordering::Relaxed);
+                count.store(index + 1, Ordering::Relaxed);
                 if let Some((route, _time)) = v.get(index) {
                     if route.is_p2p() && route.rt != 199 {
                         return Ok(*route);
diff --git a/vnt/src/channel/udp_channel.rs b/vnt/src/channel/udp_channel.rs
index 2cb123d..3957381 100644
--- a/vnt/src/channel/udp_channel.rs
+++ b/vnt/src/channel/udp_channel.rs
@@ -1,5 +1,5 @@
 use std::collections::HashMap;
-use std::net::{IpAddr, UdpSocket as StdUdpSocket};
+use std::net::UdpSocket as StdUdpSocket;
 use std::net::{Ipv4Addr, SocketAddr};
 use std::sync::mpsc::{sync_channel, Receiver};
 use std::{io, thread};
@@ -155,7 +155,9 @@ where
     H: RecvChannelHandler,
 {
     let port = context.main_udp_socket[index].local_addr()?.port();
+    let context_ = context.clone();
     let worker = stop_manager.add_listener(format!("main_udp_listen-{}", index), move || {
+        context_.stop();
         match StdUdpSocket::bind("127.0.0.1:0") {
             Ok(udp) => {
                 if let Err(e) = udp.send_to(
@@ -191,22 +193,8 @@ where
         match udp_socket.recv_from(&mut buf) {
             Ok((len, addr)) => {
                 if &buf[..len] == b"stop" {
-                    match addr.ip() {
-                        IpAddr::V4(ip) => {
-                            if ip.is_loopback() {
-                                return Ok(());
-                            }
-                        }
-                        IpAddr::V6(ip) => {
-                            if ip.is_loopback() {
-                                return Ok(());
-                            }
-                            if let Some(ip) = ip.to_ipv4_mapped() {
-                                if ip.is_loopback() {
-                                    return Ok(());
-                                }
-                            }
-                        }
+                    if context.is_stop() {
+                        return Ok(());
                     }
                 }
                 recv_handler.handle(&mut buf[..len], RouteKey::new(false, index, addr), &context);