diff --git a/src/player_list.rs b/src/player_list.rs index 1e14919..b640217 100644 --- a/src/player_list.rs +++ b/src/player_list.rs @@ -56,16 +56,6 @@ impl PlayerLists { (PlayerListId(key), pl) } - /// Returns the number of player lists. - pub fn len(&self) -> usize { - self.slab.len() - } - - /// Returns `true` if there are no player lists. - pub fn is_empty(&self) -> bool { - self.slab.len() == 0 - } - /// Gets a shared reference to the player list with the given player list /// ID. /// @@ -83,8 +73,7 @@ impl PlayerLists { } pub(crate) fn update(&mut self) { - self.slab.collect_garbage(); - for (_, pl) in self.slab.iter_mut() { + for pl in self.slab.iter_mut() { for entry in pl.entries.values_mut() { entry.bits = EntryBits::new(); } diff --git a/src/slab_rc.rs b/src/slab_rc.rs index 935725c..d725f47 100644 --- a/src/slab_rc.rs +++ b/src/slab_rc.rs @@ -5,32 +5,80 @@ use std::hash::{Hash, Hasher}; use std::iter::FusedIterator; use std::sync::Arc; -use rayon::iter::{IntoParallelRefIterator, IntoParallelRefMutIterator, ParallelIterator}; - -use crate::slab::Slab; - -#[derive(Clone, Debug)] -pub struct RcSlab { - slab: Slab>, -} +use flume::{Receiver, Sender}; #[derive(Debug)] -struct Slot { - value: T, - key: Key, +pub struct RcSlab { + entries: Vec, + free_send: Sender, + free_recv: Receiver, } -impl Clone for Slot { - fn clone(&self) -> Self { +impl RcSlab { + pub fn new() -> Self { + let (free_send, free_recv) = flume::unbounded(); + Self { - value: self.value.clone(), - key: Key(Arc::new(*self.key.0)), + entries: Vec::new(), + free_send, + free_recv, } } + + pub fn insert(&mut self, value: T) -> (Key, &mut T) { + match self.free_recv.try_recv() { + Ok(idx) => { + self.entries[idx] = value; + let k = Key(Arc::new(KeyInner { + index: idx, + free_send: self.free_send.clone(), + })); + + (k, &mut self.entries[idx]) + } + Err(_) => { + let idx = self.entries.len(); + self.entries.push(value); + let k = Key(Arc::new(KeyInner { + index: idx, + free_send: self.free_send.clone(), + })); + (k, &mut self.entries[idx]) + } + } + } + + pub fn get(&self, key: &Key) -> &T { + &self.entries[key.0.index] + } + + pub fn get_mut(&mut self, key: &Key) -> &mut T { + &mut self.entries[key.0.index] + } + + pub fn iter(&self) -> impl FusedIterator + Clone + '_ { + self.entries.iter() + } + + pub fn iter_mut(&mut self) -> impl FusedIterator + '_ { + self.entries.iter_mut() + } } -#[derive(Clone, Eq, Debug)] -pub struct Key(Arc); +#[derive(Clone, Debug)] +pub struct Key(Arc); + +#[derive(Debug)] +struct KeyInner { + index: usize, + free_send: Sender, +} + +impl Drop for KeyInner { + fn drop(&mut self) { + let _ = self.free_send.send(self.index); + } +} impl PartialEq for Key { fn eq(&self, other: &Self) -> bool { @@ -38,6 +86,8 @@ impl PartialEq for Key { } } +impl Eq for Key {} + impl PartialOrd for Key { fn partial_cmp(&self, other: &Self) -> Option { Arc::as_ptr(&self.0).partial_cmp(&Arc::as_ptr(&other.0)) @@ -56,70 +106,23 @@ impl Hash for Key { } } -impl RcSlab { - pub const fn new() -> Self { - Self { slab: Slab::new() } - } +#[cfg(test)] +pub mod tests { + use super::*; - pub fn get(&self, key: &Key) -> &T { - let slot = self.slab.get(*key.0).expect("invalid key"); - debug_assert_eq!(&slot.key, key, "invalid key"); + #[test] + fn rc_slab_insert() { + let mut slab = RcSlab::new(); + let (k, v) = slab.insert(123); + assert_eq!(*v, 123); - &slot.value - } + let k2 = slab.insert(456).0; + assert_ne!(k, k2); + assert_eq!(slab.entries.len(), 2); - pub fn get_mut(&mut self, key: &Key) -> &mut T { - let slot = self.slab.get_mut(*key.0).expect("invalid key"); - debug_assert_eq!(&slot.key, key, "invalid key"); - - &mut slot.value - } - - pub fn len(&self) -> usize { - self.slab.len() - } - - pub fn insert(&mut self, value: T) -> (Key, &mut T) { - let (_, slot) = self.slab.insert_with(|idx| Slot { - value, - key: Key(Arc::new(idx)), - }); - - (slot.key.clone(), &mut slot.value) - } - - pub fn iter(&self) -> impl ExactSizeIterator + FusedIterator + Clone + '_ { - self.slab.iter().map(|(_, slot)| (&slot.key, &slot.value)) - } - - pub fn iter_mut( - &mut self, - ) -> impl ExactSizeIterator + FusedIterator + '_ { - self.slab - .iter_mut() - .map(|(_, slot)| (&slot.key, &mut slot.value)) - } - - pub fn par_iter(&self) -> impl ParallelIterator + Clone + '_ - where - T: Sync, - { - self.slab - .par_iter() - .map(|(_, slot)| (&slot.key, &slot.value)) - } - - pub fn par_iter_mut(&mut self) -> impl ParallelIterator + '_ - where - T: Send + Sync, - { - self.slab - .par_iter_mut() - .map(|(_, slot)| (&slot.key, &mut slot.value)) - } - - pub fn collect_garbage(&mut self) { - self.slab - .retain(|_, slot| Arc::strong_count(&slot.key.0) > 1); + drop(k); + drop(k2); + slab.insert(789); + assert_eq!(slab.entries.len(), 2); } }