Merge branch 'remove-slot-mutex' into abstract-entity-state

Author: rklaehn

.github/workflows/ci.yaml

@@ -143,7 +143,7 @@ jobs:
     - uses: taiki-e/install-action@cross
 
     - name: test
-      run: cross test --all --target ${{ matrix.target }} -- --test-threads=4
+      run: cross test --all --target ${{ matrix.target }} -- --test-threads=1
       env:
         RUST_LOG: ${{ runner.debug && 'TRACE' || 'DEBUG' }}
 

src/store/fs.rs

@@ -1383,7 +1383,7 @@ impl FsStore {
             .thread_name_fn(|| {
                 format!(
                     "iroh-blob-store-{}",
-                    THREAD_NR.fetch_add(1, Ordering::SeqCst)
+                    THREAD_NR.fetch_add(1, Ordering::Relaxed)
                 )
             })
             .enable_time()

src/store/fs/bao_file.rs

@@ -519,7 +519,11 @@ impl BaoFileStorage {
     }
 }
 
-/// A cheaply cloneable handle to a bao file, including the hash and the configuration.
+/// A cheaply cloneable handle to a bao file.
+///
+/// You must call [Self::persist] to write the bitfield to disk, if you want to persist
+/// the file handle, otherwise the bitfield will not be written to disk and will have
+/// to be reconstructed on next use.
 #[derive(Debug, Clone, Default, derive_more::Deref)]
 pub(crate) struct BaoFileHandle(pub(super) watch::Sender<BaoFileStorage>);
 

src/store/fs/util/entity_manager.rs

@@ -4,6 +4,16 @@ use std::{fmt::Debug, future::Future, hash::Hash};
 use n0_future::{future, FuturesUnordered};
 use tokio::sync::{mpsc, oneshot};
 
+/// Trait to reset an entity state in place.
+///
+/// In many cases this is just assigning the default value, but e.g. for an
+/// `Arc<Mutex<T>>` resetting to the default value means an allocation, whereas
+/// reset can be done without.
+pub trait Reset: Default {
+    /// Reset the state to its default value.
+    fn reset(&mut self);
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum ShutdownCause {
     /// The entity is shutting down gracefully because the entity is idle.
@@ -373,7 +383,7 @@ mod main_actor {
                 match e {
                     mpsc::error::TrySendError::Full(cmd) => {
                         let entity_actor::Command::Spawn(spawn) = cmd else {
-                            panic!()
+                            unreachable!()
                         };
                         warn!(
                             "Entity actor inbox is full, cannot send command to entity actor {:?}.",
@@ -385,7 +395,7 @@ mod main_actor {
                     }
                     mpsc::error::TrySendError::Closed(cmd) => {
                         let entity_actor::Command::Spawn(spawn) = cmd else {
-                            panic!()
+                            unreachable!()
                         };
                         error!(
                             "Entity actor inbox is closed, cannot send command to entity actor {:?}.",
@@ -945,8 +955,9 @@ mod tests {
                 for id in values.keys() {
                     let log = global.log.get(id).unwrap();
                     if log.len() % 2 != 0 {
-                        println!("{log:#?}");
-                        panic!("Log for entity {id} must contain an even number of events");
+                        panic!(
+                            "Log for entity {id} must contain an even number of events.\n{log:#?}"
+                        );
                     }
                     for (i, (event, _)) in log.iter().enumerate() {
                         assert_eq!(
@@ -1307,193 +1318,6 @@ mod tests {
         .expect("Test failed");
     }
 
-    #[test]
-    fn counter_manager_case_1() {
-        let entries: Vec<(u64, u128)> = vec![
-            (
-                18388365709074834514,
-                194444835943844072850826645853183303049,
-            ),
-            (960158425716839792, 70550702232084465071825242386427394095),
-            (3186873658602636868, 148188033569534503124640136521127325068),
-            (
-                15841980008467069742,
-                151174981689849463642221795624442563542,
-            ),
-            (
-                13023338767385866119,
-                193238684289181333005049821157294047398,
-            ),
-            (16098863205515154997, 80978418781577370901253652214289107284),
-            (
-                15494567123826916198,
-                155627092752672738120697133860680193469,
-            ),
-            (5977791771239323572, 123472069275349355161383651481886216632),
-            (
-                13052414105389926722,
-                131961256616178196923794330816338585046,
-            ),
-            (3265887016396946394, 310496101037658730275516655380984358257),
-            (6225591563791670942, 286677436984807113590349457123804595045),
-            (7719654970290070575, 261360661842631502732458498326060575764),
-            (16346812062252468634, 20400716043115856216887689562958795320),
-            (14895994802127672851, 65044937087750427440151725121831729492),
-            (
-                13867149684135690908,
-                251366416673854856023601420456388852782,
-            ),
-            (13198762185366773363, 16049497253389531856433290782978461866),
-            (15662018632505153162, 80545892061421306362192535611401208653),
-            (
-                10904741085833535475,
-                317619745773233937506743252527124191472,
-            ),
-            (9659369546555131509, 320745667028802630937237317954626404036),
-            (9587720266200277507, 53717910536324979289331387490265657851),
-            (4520474546171085081, 167298150261458948825809210629580417056),
-            (16317689018231234032, 56904692996624675090815630807576954277),
-            (1145020483821164407, 62208025549090848844487296478186250150),
-            (12275840731881721168, 91306991379847803048964981673487745749),
-            (4420042860659089062, 273964008846252634637821526029408158951),
-            (6122064752200521014, 318781380881508640367600316004018858292),
-            (
-                18331791613663867073,
-                244797279528173449608649865877521898679,
-            ),
-            (
-                12536131143448721128,
-                118936654309826194076792135199593582814,
-            ),
-            (
-                10871411965855657987,
-                217312065385902682099626586116718936639,
-            ),
-            (
-                10961019520920546084,
-                194969590260788153365214695605968172735,
-            ),
-            (465341043682902302, 313210447970957224597900277640449786169),
-            (1930531913153049005, 191839680217418490007545636458005832918),
-            (17610861271281749389, 2158112867473280423584106075388203148),
-            (7152124269848448741, 136954811775819110432364454487364326065),
-            (1568989979285654655, 20222353298755466913838704346056341244),
-            (7965349575514397114, 289787046147370952383585129455974538147),
-            (4190853641474855654, 252661458083167852070830937806141596795),
-            (15998503947870046493, 64060435197012338872019450356958606700),
-            (13026276258592007494, 19335529647117235114474075201115024719),
-            (8441510215020513967, 280188261773078012965811787866560404361),
-            (
-                10888572289604438016,
-                107801275926977255088182396292810389978,
-            ),
-            (8028792684930056950, 279265463046144709574860584412295388880),
-            (
-                16285632686692032678,
-                173211331899082901582219216760818084141,
-            ),
-            (4252535566180812551, 26342932911822612391116163156475293693),
-            (
-                13804628128928961483,
-                284154599974337978388128510231757620390,
-            ),
-            (8546188891118395704, 10518169822941605468924627069322563371),
-            (15103555168237341487, 65242721972208308766038820838106150898),
-            (
-                10178269157159463595,
-                192339869053417790279388173311883453342,
-            ),
-            (4581403777792509197, 14776646444861423261575214657678462007),
-            (
-                16380082972821908840,
-                171941200656585174471984020218050726276,
-            ),
-            (1264309960451701386, 134493939272359117017871860428297927223),
-            (
-                14979589892199220502,
-                111589155031018603387685907617392369538,
-            ),
-            (17242367228189069279, 72930121541745954198212835929591900203),
-            (8121456326821108294, 66979609476744620710556910365293284684),
-            (2007258142204162697, 251687000354783335205647262458691353893),
-            (8737832108509452949, 220588935218057557435066308484665836550),
-            (1633859723143576509, 136307380230378890472597645690064879661),
-            (3631531089628868939, 117193189302995348875537780371743885092),
-            (14116484475174217773, 54047184398246577478804256478007223219),
-            (3958875956249588345, 245230852280065944767864702369745470693),
-            (
-                13540877093555590901,
-                315784456112577256036745768678791135182,
-            ),
-            (
-                16806612096618910759,
-                249546776531613765982448526314333635625,
-            ),
-            (787606879345898885, 106585693463551369746522944067316950687),
-            (4600372411498679193, 212195607965427065442095429056450131388),
-            (
-                15549710434033886583,
-                123117317137788876226523772665571872625,
-            ),
-            (18351596054746942123, 45300934307303895571243742711664551642),
-            (4289295596982939716, 57179935864702088014701622708597340262),
-            (
-                14236340878952223471,
-                276513355195514407125503145808612698776,
-            ),
-            (
-                16793945091236936234,
-                225504874419954047826410211270129372771,
-            ),
-            (6083434966673351288, 132608700674916922118081114178409918884),
-            (8650928456447960764, 224830460140536261415627615111659295798),
-            (544098001581244681, 23519946291190733604063394180239868939),
-            (6677173915608753908, 172822575779164355980943891119053877737),
-            (9904411679706436478, 305002806492672706404515108669905493060),
-            (3748913669028317014, 198508895764401149420178353122470259248),
-            (18429857739493813163, 52742680723713620788331716379318053621),
-            (
-                16160446355791350386,
-                138122750568611844010694432995073272608,
-            ),
-            (6546381586950511182, 211244543160814081913465334374927296227),
-            (2141568463796935601, 208339082504024808729178477691685775704),
-            (1557540402694871065, 123820668511543909640550604769940320362),
-            (4806376387020260938, 242198889246468758028422097703476517279),
-            (10572989355971956281, 10538572317690180019027649199957487191),
-            (4419528985467303189, 241717029481312211533043931115392103679),
-            (6026123969772770806, 107638168362307674120726354668199681855),
-            (10446707069162381062, 8055541720197104310969619867721024782),
-            (5775673932884639633, 78808623784784204136453081044300463180),
-            (8334877772954168794, 247863931114156722743273061049957344581),
-            (3268873687286354543, 295921729987362586985932430782633333103),
-            (3966164288731105812, 168025259063973884714536065035065597041),
-            (
-                11203489126702094930,
-                202722625156888049503317726338728149715,
-            ),
-            (15630106992179578877, 35009551135670394358942249653897229827),
-            (8273535691491394488, 109976597742540116974717569314107701591),
-            (3805901298951698996, 235306340537276700227769214923480868076),
-            (2117742626710589122, 327739111844587050291636958827184679871),
-            (
-                15269331250753017373,
-                319720502694359881891904231590616597459,
-            ),
-            (6441260656891689190, 21330291223001965237969254632976565895),
-            (7256786238996167073, 176897044696772200117671096478294494714),
-            (12590622778405228523, 79144381831870004849360854116364256296),
-        ];
-        let rt = tokio::runtime::Builder::new_multi_thread()
-            .build()
-            .expect("Failed to create tokio runtime");
-        rt.block_on(async move {
-            let db = mem::MemDb::new();
-            test_random(db, &entries).await
-        })
-        .expect("Test failed");
-    }
-
     #[test_strategy::proptest]
     fn test_counters_manager_proptest_fs(entries: Vec<(u64, u128)>) {
         let dir = tempfile::tempdir().unwrap();