Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

move msg handling to a loop to allow to handle multiple requests per tick

Browse Source
This commit is contained in:
Marcel Märtens 2024-03-17 12:58:30 +01:00
parent 0507ef58ed
commit a35cc5b9c0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server-cli/src/main.rs
View File

@ -299,7 +299,7 @@ fn server_loop(
let mut bench_exit_time = None; let mut bench_exit_time = None;
let mut tick_no = 0u64; let mut tick_no = 0u64;
loop { 'outer: loop {
span!(guard, "work"); span!(guard, "work");
if let Some(bench) = bench { if let Some(bench) = bench {
if let Some(t) = bench_exit_time { if let Some(t) = bench_exit_time {
@ -408,11 +408,11 @@ fn server_loop(
}; };
if let Some(tui) = tui.as_ref() { if let Some(tui) = tui.as_ref() {
if let Ok(msg) = tui.msg_r.try_recv() { while let Ok(msg) = tui.msg_r.try_recv() {
let (sender, mut recv) = tokio::sync::oneshot::channel(); let (sender, mut recv) = tokio::sync::oneshot::channel();
if handle_msg(msg, sender) { if handle_msg(msg, sender) {
info!("Closing the server"); info!("Closing the server");
break; break 'outer;
} }
if let Ok(msg_answ) = recv.try_recv() { if let Ok(msg_answ) = recv.try_recv() {
match msg_answ { match msg_answ {
@ -423,10 +423,10 @@ fn server_loop(
} }
} }
if let Ok((msg, sender)) = web_ui_request_r.try_recv() { while let Ok((msg, sender)) = web_ui_request_r.try_recv() {
if handle_msg(msg, sender) { if handle_msg(msg, sender) {
info!("Closing the server"); info!("Closing the server");
break; break 'outer;
} }
} }