add test for panic in cycle recovery function

Author: carljm

tests/parallel/cycle_panic.rs

@@ -0,0 +1,39 @@
+//! Test for panic in cycle recovery function, in cross-thread cycle.
+use crate::setup::{Knobs, KnobsDatabase};
+
+#[salsa::tracked(cycle_fn=cycle_fn, cycle_initial=initial)]
+fn query_a(db: &dyn KnobsDatabase) {
+    db.signal(1);
+    db.wait_for(2);
+    query_b(db);
+}
+
+#[salsa::tracked]
+fn query_b(db: &dyn KnobsDatabase) {
+    db.wait_for(1);
+    db.signal(2);
+    query_a(db);
+}
+
+fn cycle_fn(_db: &dyn KnobsDatabase, _value: &(), _count: u32) -> salsa::CycleRecoveryAction<()> {
+    panic!("cancel!")
+}
+
+fn initial(_db: &dyn KnobsDatabase) {}
+
+#[test]
+fn execute() {
+    let db = Knobs::default();
+
+    std::thread::scope(|scope| {
+        let db_t1 = db.clone();
+        let thread_a = scope.spawn(move || query_a(&db_t1));
+
+        let db_t2 = db.clone();
+        let thread_b = scope.spawn(move || query_b(&db_t2));
+
+        // The main thing here is that we don't deadlock.
+        assert!(thread_a.join().is_err());
+        assert!(thread_b.join().is_err());
+    });
+}

tests/parallel/main.rs

@@ -3,6 +3,7 @@ mod setup;
 mod cycle_a_t1_b_t2;
 mod cycle_ab_peeping_c;
 mod cycle_nested_three_threads;
+mod cycle_panic;
 mod parallel_cancellation;
 mod parallel_map;
 mod signal;

tests/parallel/parallel_cancellation.rs

@@ -1,6 +1,4 @@
-//! Test for cycle recover spread across two threads.
-//! See `../cycles.rs` for a complete listing of cycle tests,
-//! both intra and cross thread.
+//! Test for thread cancellation.
 
 use salsa::Cancelled;
 use salsa::Setter;