vel
/
VelNet-Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more reduction in long write locks

main
Kyle Johnsen 2022-02-08 10:20:26 -05:00
parent d5cfc471e2
commit 38eb7f2c0e
1 changed files with 62 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/main.rs
View File

@ -264,70 +264,79 @@ fn send_client_left_message(to: &Arc<Client>, from: u32, room: &str){
fn client_leave_room(client: &Arc<Client>, send_to_client: bool){ fn client_leave_room(client: &Arc<Client>, send_to_client: bool){
//first remove the client from the room they are in //first remove the client from the room they are in
let mut room = client.room.write().unwrap(); //I need to get the room, because I'll be modifying the clients in it {
let room = client.room.read().unwrap(); //I need to get the room, because I'll be modifying the clients in it
if room.is_some(){
{
let mut change_master = false;
let mut new_master_id = 0;
println!("Client in room, leaving");
let room = room.as_ref().unwrap();
if room.is_some(){ //may have to choose a new master
{
println!("Client in room, leaving");
let room = room.as_ref().unwrap();
//may have to choose a new master {
let mut master_client = room.master_client.write().unwrap();
let mut change_master = false;
let mut clients = room.clients.write().unwrap();
let mut new_master_id = 0; let clients = room.clients.read().unwrap();
let master_client = room.master_client.read().unwrap();
if master_client.id == client.id {
println!("Will change master");
//change the master
change_master = true;
for (_k,v) in clients.iter() {
if v.id != client.id {
new_master_id = v.id;
break;
}
}
}
if master_client.id == client.id { println!("Client leaving current room {}",&room.name);
println!("Will change master");
//change the master for (_k,v) in clients.iter() {
change_master = true; if !send_to_client && v.id == client.id{
for (_k,v) in clients.iter() { continue;
if v.id != client.id { }else if v.id == client.id {
new_master_id = v.id; send_you_left_message(v, &room.name);
break; }else{
send_client_left_message(v, client.id, &room.name);
}
} }
} }
}
{
let mut clients = room.clients.write().unwrap();
println!("Client leaving current room {}",&room.name); clients.remove(&client.id); //remove the client from that list in the room
for (_k,v) in clients.iter() {
if !send_to_client && v.id == client.id{
continue;
}else if v.id == client.id {
send_you_left_message(v, &room.name);
}else{
send_client_left_message(v, client.id, &room.name);
}
}
clients.remove(&client.id); //remove the client from that list in the room
//if the room is empty, destroy it as well
if clients.len() == 0 {
let mut rooms = client.rooms_mutex.write().unwrap();
rooms.remove(&room.name);
println!("Destroyed room {}",&room.name)
}else if change_master{
println!("Changing master to {}",new_master_id);
for (_k,v) in clients.iter() {
send_client_master_message(&v, new_master_id);
} }
let clients = room.clients.read().unwrap();
*master_client = clients.get(&new_master_id).unwrap().clone(); //if the room is empty, destroy it as well
if clients.len() == 0 {
let mut rooms = client.rooms_mutex.write().unwrap();
rooms.remove(&room.name);
println!("Destroyed room {}",&room.name)
}else if change_master{
println!("Changing master to {}",new_master_id);
for (_k,v) in clients.iter() {
send_client_master_message(&v, new_master_id);
}
{
let mut master_client = room.master_client.write().unwrap();
*master_client = clients.get(&new_master_id).unwrap().clone();
}
}
} }
} else{
println!("Client not in room");
} }
} else{
println!("Client not in room");
} }
{
*room = Option::None; let mut room = client.room.write().unwrap();
*room = Option::None;
}
} }