joshuafhiggins/connect4-moderator-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 2 Activity

fix: some deadlocks

Browse Source
This commit is contained in:
Joshua Higgins
2025-12-06 18:14:51 -05:00
Unverified
parent 08d9942701
commit 8d4f69f7bb
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main.rs
View File

@@ -120,7 +120,8 @@ async fn handle_connection(
} }
let mut is_taken = false; let mut is_taken = false;
for client in sd.clients.read().await.values() { let clients_guard = sd.clients.read().await;
for client in clients_guard.values() {
if requested_username == client.read().await.username { if requested_username == client.read().await.username {
let _ = send(&tx, &format!("ERROR:INVALID:ID:{}", requested_username)); let _ = send(&tx, &format!("ERROR:INVALID:ID:{}", requested_username));
is_taken = true; is_taken = true;
@@ -132,6 +133,8 @@ async fn handle_connection(
continue; continue;
} }
drop(clients_guard);
// not taken // not taken
sd.observers.write().await.remove(&addr); sd.observers.write().await.remove(&addr);
sd.usernames.write().await.insert(requested_username.clone(), addr); sd.usernames.write().await.insert(requested_username.clone(), addr);
@@ -708,12 +711,18 @@ async fn handle_connection(
// Remove and terminate any matches // Remove and terminate any matches
// We may not be a client disconnecting, do this check // We may not be a client disconnecting, do this check
if sd.clients.read().await.get(&addr).is_some() { let clients_guard = sd.clients.read().await;
if let Some(match_id) = sd.clients.read().await.get(&addr).unwrap().read().await.current_match { if clients_guard.get(&addr).is_some() {
let client = clients_guard.get(&addr).unwrap().read().await;
let username = client.username.clone();
if let Some(match_id) = client.current_match {
drop(client);
terminate_match(match_id, &sd.matches, &sd.clients, &sd.observers, sd.demo_mode).await; terminate_match(match_id, &sd.matches, &sd.clients, &sd.observers, sd.demo_mode).await;
} else {
drop(client);
} }
let client = sd.clients.write().await.remove(&addr).unwrap();
let username = client.read().await.username.clone(); sd.clients.write().await.remove(&addr).unwrap();
sd.usernames.write().await.remove(&username); sd.usernames.write().await.remove(&username);
} }