StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

refactor(event loop): remove once_cell

Browse Source
This commit is contained in:
Nova
2022-09-03 08:43:37 -04:00
parent 98d5b4b5d6
commit a42834063e
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/eventloop.rs
View File

@@ -5,7 +5,7 @@ use slab::Slab;
use std::sync::atomic::AtomicU64; use std::sync::atomic::AtomicU64;
use std::sync::Arc; use std::sync::Arc;
use tokio::net::UnixListener; use tokio::net::UnixListener;
use tokio::sync::{Mutex, Notify, OnceCell}; use tokio::sync::{Mutex, Notify};
use tokio::task::JoinHandle; use tokio::task::JoinHandle;
pub static FRAME: AtomicU64 = AtomicU64::new(0); pub static FRAME: AtomicU64 = AtomicU64::new(0);
@@ -13,7 +13,7 @@ pub static FRAME: AtomicU64 = AtomicU64::new(0);
pub struct EventLoop { pub struct EventLoop {
pub socket_path: String, pub socket_path: String,
stop_notifier: Arc<Notify>, stop_notifier: Arc<Notify>,
pub clients: Mutex<Slab<OnceCell<Arc<Client>>>>, pub clients: Mutex<Slab<Arc<Client>>>,
} }
impl EventLoop { impl EventLoop {
@@ -41,12 +41,9 @@ impl EventLoop {
loop { loop {
let (socket, _) = socket.accept().await?; let (socket, _) = socket.accept().await?;
let mut clients = event_loop.clients.lock().await; let mut clients = event_loop.clients.lock().await;
let idx = clients.insert(OnceCell::new()); let vacant_client = clients.vacant_entry();
let _ = clients.get(idx).unwrap().set(Client::from_connection( let idx = vacant_client.key();
idx, vacant_client.insert(Client::from_connection(idx, &event_loop, socket));
&event_loop,
socket,
));
} }
}; };