server/game2006rust
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
azw 2024-05-09 22:02:31 +08:00
parent 54b5821c39
commit 45a48a1471
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/stat/src/app/user_app.rs
View File

@ -9,9 +9,11 @@ use f9::app::HttpContext;
use crate::listener::WsListener; use crate::listener::WsListener;
use crate::upstream::UpStreamMgr; use crate::upstream::UpStreamMgr;
use bytes::BytesMut; use bytes::BytesMut;
use r9::xtimer::TimerList;
//use crate::ss; //use crate::ss;
pub struct DownStreamPack { pub struct DownStreamPack {
holder: Option<Rc::<RefCell::<DownStreamPack>>>,
socket_handle: u16, socket_handle: u16,
data: bytes::BytesMut, data: bytes::BytesMut,
entry: Rc::<RefCell::<r9::ListHead<DownStreamPack>>>, entry: Rc::<RefCell::<r9::ListHead<DownStreamPack>>>,
@ -74,12 +76,14 @@ impl f9::app::UserApp for UserApp {
impl UserApp { impl UserApp {
pub fn add_down_stream_pack(&mut self, socket_handle: u16, data: bytes::BytesMut) { pub fn add_down_stream_pack(&self, socket_handle: u16, data: bytes::BytesMut) {
let node = Rc::new(RefCell::new(DownStreamPack{ let node = Rc::new(RefCell::new(DownStreamPack{
holder: Default::default(),
socket_handle: socket_handle, socket_handle: socket_handle,
data: data, data: data,
entry: r9::ListHead::< crate::app::user_app::DownStreamPack>::new_node(Default::default()), entry: r9::ListHead::< crate::app::user_app::DownStreamPack>::new_node(Default::default()),
})); }));
node.borrow_mut().holder = Some(node.clone());
node.borrow_mut().entry = r9::ListHead::< crate::app::user_app::DownStreamPack>::new_node(Rc::downgrade(&node)); node.borrow_mut().entry = r9::ListHead::< crate::app::user_app::DownStreamPack>::new_node(Rc::downgrade(&node));
self.net_msg_queue.borrow_mut().push(&node.borrow_mut().entry); self.net_msg_queue.borrow_mut().push(&node.borrow_mut().entry);
} }

2
server/stat/src/listener/wslistener.rs
View File

@ -97,7 +97,7 @@ impl WsConn {
println!("recv buf_len:{0}", tmp_bytes.len()); println!("recv buf_len:{0}", tmp_bytes.len());
} }
{ {
UserApp::instance().borrow_mut().add_down_stream_pack(self.socket_handle, tmp_bytes); UserApp::instance().borrow().add_down_stream_pack(self.socket_handle, tmp_bytes);
} }
offset += (pack_len as usize) + 12; offset += (pack_len as usize) + 12;
} }

2
third_party/librust vendored

@ -1 +1 @@
Subproject commit 3a2b95dfc948ab2ac28b634e38b12753ca265874 Subproject commit cbca2a666f64fe55357179c1ddd13e1ed5a43c9c