From cc2eb4ef053da7a53663bdecac912a1c49490301 Mon Sep 17 00:00:00 2001
From: stale <redkugelblitzin@gmail.com>
Date: Fri, 1 Jul 2022 22:14:52 -0300
Subject: fix the mess i made of type aliases
---
src/conn.rs | 2 +-
src/livepos.rs | 5 +++--
src/main.rs | 36 +++++++++++++++++-------------------
src/types.rs | 15 +++++++--------
4 files changed, 28 insertions(+), 30 deletions(-)
(limited to 'src')
diff --git a/src/conn.rs b/src/conn.rs
index addf3c5..7adeeae 100644
--- a/src/conn.rs
+++ b/src/conn.rs
@@ -147,7 +147,7 @@ pub async fn handle_room(streams: RoomStreams, addr: SocketAddr, rinfo: (RoomId,
let uid = {
// new scope cuz paranoid bout deadlocks
let conn = Conn { addr, tx: tx.clone() };
- room.write().await.players.insert_conn(conn, name.clone(), clr).await
+ room.write().await.players.write().await.insert_conn(conn, name.clone(), clr)
};
let players_lock = players.read().await;
let me = players_lock.get(&addr).unwrap();
diff --git a/src/livepos.rs b/src/livepos.rs
index 9112755..b19eda6 100644
--- a/src/livepos.rs
+++ b/src/livepos.rs
@@ -1,6 +1,7 @@
use crate::types::*;
+use std::sync::Arc;
use tokio::sync::mpsc as tokio_mpsc;
-use tokio::sync::Mutex;
+use tokio::sync::{ RwLock, Mutex };
use std::collections::{HashMap,HashSet};
use tokio::time::{self, Duration};
use warp::ws::Message;
@@ -16,7 +17,7 @@ pub struct Req {
pub data: ReqData,
}
-pub async fn livepos(players: PlayerMapData, mut recv: tokio_mpsc::UnboundedReceiver<Req>) {
+pub async fn livepos(players: Arc<RwLock<PlayerMap>>, mut recv: tokio_mpsc::UnboundedReceiver<Req>) {
let positions = Mutex::new(HashMap::new());
let dirty = Mutex::new(HashSet::new());
let process_upds = async {
diff --git a/src/main.rs b/src/main.rs
index abb2e48..eec9cf8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -51,7 +51,7 @@ fn main() -> Result<(), Box<dyn Error>> {
#[tokio::main]
async fn tokio_main(conf: Conf) -> Result<(), Box<dyn Error>> {
let conf = Arc::new(conf);
- let rooms: RoomMap = Arc::new(RwLock::new(HashMap::new()));
+ let rooms = Arc::new(RwLock::new(RoomMap::new()));
let public_rooms = Arc::new(RwLock::new(HashMap::new()));
use warp::*;
@@ -60,6 +60,7 @@ async fn tokio_main(conf: Conf) -> Result<(), Box<dyn Error>> {
let listing = {
let rooms = rooms.clone();
let pubs = public_rooms.clone();
+
path!("rlist").and_then(move || {
let rooms = rooms.clone();
let pubs = pubs.clone();
@@ -91,8 +92,9 @@ async fn tokio_main(conf: Conf) -> Result<(), Box<dyn Error>> {
let r = rooms.clone();
let conf = conf.clone();
async move {
- let empty_len = empty_rooms(r.clone()).await.len();
- let space = conf.limits.room_slots - r.read().await.len() + empty_len;
+ let r = r.read().await;
+ let empty_len = empty_rooms(&r).await.len();
+ let space = conf.limits.room_slots - r.len() + empty_len;
Ok::<String, std::convert::Infallible>(space.to_string())
}
})
@@ -101,6 +103,7 @@ async fn tokio_main(conf: Conf) -> Result<(), Box<dyn Error>> {
let rooms = rooms.clone();
let pubs = public_rooms.clone();
let conf = conf.clone();
+
post().and(path("r")).and(body::content_length_limit(conf.limits.form_size)).and(body::form())
.and_then(move |rinfo: HashMap<String, String>| {
println!("{:?}", rinfo);
@@ -109,10 +112,12 @@ async fn tokio_main(conf: Conf) -> Result<(), Box<dyn Error>> {
let conf = conf.clone();
async move {
let slots_available = conf.limits.room_slots - rooms.read().await.len();
- let empty = empty_rooms(rooms.clone()).await;
+ let empty = empty_rooms(&*rooms.read().await).await;
if slots_available < 1 {
if slots_available + empty.len() > 0 {
- remove_room(rooms.clone(), pubs.clone(), empty[0].clone()).await;
+ let mut roomsl = rooms.write().await;
+ let mut pubsl = pubs.write().await;
+ remove_room(&mut *roomsl, &mut *pubsl, empty[0].clone());
} else {
return Err(reject::custom(NoRoomSlots));
}
@@ -204,7 +209,7 @@ async fn tokio_main(conf: Conf) -> Result<(), Box<dyn Error>> {
}
// If a move is made, broadcast new board, else just send current board
-async fn gameloop(mut move_rx: tokio::sync::mpsc::UnboundedReceiver<MetaMove>, players: PlayerMapData, bconf: minesweeper::BoardConf) {
+async fn gameloop(mut move_rx: tokio::sync::mpsc::UnboundedReceiver<MetaMove>, players: Arc<RwLock<PlayerMap>>, bconf: minesweeper::BoardConf) {
// FIXME: push new board if and only if there aren't any remaining commands in the queue
use minesweeper::*;
use flate2::{ Compression, write::DeflateEncoder };
@@ -275,9 +280,8 @@ async fn error_handler(err: Rejection) -> Result<impl Reply, std::convert::Infal
}
}
-async fn empty_rooms(rooms: RoomMap) -> Vec<RoomId> {
- let rl = rooms.read().await;
- futures::stream::iter(rl.iter())
+async fn empty_rooms(rooms: &RoomMap) -> Vec<RoomId> {
+ futures::stream::iter(rooms.iter())
.filter_map(|(id,roomarc)| async move {
let rrl = roomarc.read().await;
let rrrl = rrl.players.read().await;
@@ -305,7 +309,7 @@ fn room_from_form(uid: RoomId, rinfo: &HashMap<String,String>, conf: &Conf) -> R
if n.is_empty() { uid.to_string() } else { n }
};
- let players = PlayerMap::default();
+ let players = Arc::new(RwLock::new(PlayerMap::default()));
let (cmd_tx, cmd_rx) = tokio::sync::mpsc::unbounded_channel();
let game_handle = tokio::spawn(gameloop(cmd_rx, players.clone(), board_conf));
@@ -330,14 +334,8 @@ fn room_from_form(uid: RoomId, rinfo: &HashMap<String,String>, conf: &Conf) -> R
} else { Err(warp::reject::custom(BadFormData)) }
}
-async fn remove_room<T>(rooms: RoomMap, pubs: Arc<RwLock<HashMap<RoomId,T>>>, id: RoomId) {
- {
- let mut rwl = rooms.write().await;
- rwl.remove(&id);
- }
- {
- let mut pwl = pubs.write().await;
- pwl.remove(&id);
- }
+fn remove_room<T>(rooms: &mut RoomMap, pubs: &mut HashMap<RoomId,T>, id: RoomId) {
+ rooms.remove(&id);
+ pubs.remove(&id);
}
diff --git a/src/types.rs b/src/types.rs
index 7cdd44c..0bd7881 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -24,7 +24,7 @@ pub struct RoomConf {
pub struct Room {
pub conf: RoomConf,
- pub players: PlayerMap,
+ pub players: Arc<RwLock<PlayerMap>>,
pub game_driver: tokio::task::JoinHandle<()>,
pub cmd_stream: CmdTx,
pub livepos_driver: tokio::task::JoinHandle<()>,
@@ -90,8 +90,8 @@ impl RoomId {
}
pub type CmdTx = tokio::sync::mpsc::UnboundedSender<MetaMove>;
-pub type RoomMap = Arc<RwLock<HashMap<RoomId, Arc<RwLock<Room>>>>>;
-pub type PlayerMapData = Arc<RwLock<HashMap<SocketAddr, Player>>>;
+pub type RoomMap = HashMap<RoomId, Arc<RwLock<Room>>>;
+pub type PlayerMapData = HashMap<SocketAddr, Player>;
#[derive(Debug)]
pub struct PlayerMap {
inner: PlayerMapData,
@@ -99,7 +99,7 @@ pub struct PlayerMap {
}
impl Deref for PlayerMap {
- type Target = Arc<RwLock<HashMap<SocketAddr, Player>>>;
+ type Target = PlayerMapData;
fn deref(&self) -> &Self::Target {
&self.inner
}
@@ -111,15 +111,14 @@ impl DerefMut for PlayerMap {
}
impl Default for PlayerMap {
fn default() -> Self {
- Self { inner: Arc::new(RwLock::new(HashMap::new())), uid_counter: 0.into() }
+ Self { inner: HashMap::new(), uid_counter: 0.into() }
}
}
impl PlayerMap {
- pub async fn insert_conn(&mut self, conn: Conn, name: String, clr: String) -> usize {
- let mut map = self.write().await;
+ pub fn insert_conn(&mut self, conn: Conn, name: String, clr: String) -> usize {
let uid = self.uid_counter.fetch_add(1, Ordering::Relaxed);
- map.insert(
+ self.insert(
conn.addr,
Player { conn, uid, name, clr },
);
--
cgit v1.2.3