wip: use async-lock with an async RefCell

Cargo.toml

@@ -187,3 +187,6 @@ zero_sized_map_values = "warn"
 
 # eframe = { path = "../../egui/crates/eframe" }
 # egui = { path = "../../egui/crates/egui" }
+
+# use local async-lock as dependency of async-std for dev-dependencies, instead of published one
+async-lock = { path = "../_crates/async-lock/" }

puffin_http/Cargo.toml

@@ -16,6 +16,7 @@ include = ["**/*.rs", "Cargo.toml", "README.md"]
 [dependencies]
 anyhow = "1.0"
 async-executor = "1.4"
+async-lock = "3.4"
 async-net = "2.0.0"
 flume = "0.11"
 futures-lite = { version = "2.5", default-features = false }

puffin_http/src/server.rs

@@ -1,10 +1,11 @@
 use anyhow::Context as _;
 use async_executor::{LocalExecutor, Task};
+use async_lock::RefCell;
 use async_net::{SocketAddr, TcpListener, TcpStream};
+
 use futures_lite::{future, AsyncWriteExt};
 use puffin::{FrameSinkId, GlobalProfiler, ScopeCollection};
 use std::{
-    cell::RefCell,
     rc::Rc,
     sync::{
         atomic::{AtomicUsize, Ordering},
@@ -382,14 +383,14 @@ impl<'a> PuffinServerConnection<'a> {
                     // Send all scopes when new client connects.
                     // TODO: send all previous scopes at connection, not on regular send
                     //self.send_all_scopes = true;
-                    self.clients.borrow_mut().push(Client {
+                    self.clients.borrow_mut().await.push(Client {
                         client_addr,
                         packet_tx: Some(packet_tx),
                         join_handle: Some(join_handle),
                         send_all_scopes: true,
                     });
                     self.num_clients
-                        .store(self.clients.borrow().len(), Ordering::SeqCst);
+                        .store(self.clients.borrow().await.len(), Ordering::SeqCst);
                 }
                 Err(e) if e.kind() == std::io::ErrorKind::WouldBlock => {
                     break; // Nothing to do for now.
@@ -412,7 +413,7 @@ struct PuffinServerSend {
 
 impl PuffinServerSend {
     pub async fn send(&mut self, frame: &puffin::FrameData) -> anyhow::Result<()> {
-        if self.clients.borrow().is_empty() {
+        if self.clients.borrow().await.is_empty() {
             return Ok(());
         }
         puffin::profile_function!();
@@ -443,9 +444,8 @@ impl PuffinServerSend {
         let packet_all_scopes: Packet = packet_all_scopes.into();
 
         // Send frame to clients, remove disconnected clients and update num_clients var
-        let clients = self.clients.borrow();
         let mut idx_to_remove = Vec::new();
-        for (idx, client) in clients.iter().enumerate() {
+        for (idx, client) in self.clients.borrow().await.iter().enumerate() {
             let packet = if client.send_all_scopes {
                 packet_all_scopes.clone()
             } else {
@@ -456,7 +456,7 @@ impl PuffinServerSend {
             }
         }
 
-        let mut clients = self.clients.borrow_mut();
+        let mut clients = self.clients.borrow_mut().await;
         idx_to_remove.iter().rev().for_each(|idx| {
             clients.remove(*idx);
         });