Address soundness hole in cycle prevention

This commit is contained in:
TechnoPorg committed 2026-01-29 06:56:17 +01:00
1 parent 4ad88bcd68
commit f82205baf4
80 files changed
+730 -717

No files matched your search

+18 -15
View File
@@ -1,7 +1,7 @@
//! Tests for concurrent access patterns and race conditions
use crate::common::task_fn;
use dagx::{DagResult, DagRunner};
use dagx::{DagResult, DagRunner, TaskHandle};
use futures::FutureExt;
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
use std::sync::Arc;
@@ -19,7 +19,7 @@ async fn test_concurrent_result_retrieval() -> DagResult<()> {
tokio::time::sleep(tokio::time::Duration::from_millis(1)).await;
i as usize
}));
(&task).into()
task.into()
})
.collect();
@@ -64,7 +64,7 @@ async fn test_simultaneous_dag_building_and_execution() -> DagResult<()> {
let mut tasks: Vec<dagx::TaskHandle<i32>> = Vec::new();
for i in 5..50 {
let task = dag_build.add_task(task_fn(move |_: ()| async move { i }));
tasks.push((&task).into());
tasks.push(task.into());
tokio::time::sleep(tokio::time::Duration::from_millis(1)).await;
}
building.store(true, Ordering::SeqCst);
@@ -81,7 +81,7 @@ async fn test_simultaneous_dag_building_and_execution() -> DagResult<()> {
let additional_tasks = build_handle.await.unwrap();
// Initial tasks should have results
for (i, task) in initial.iter().enumerate() {
for (i, task) in initial.into_iter().enumerate() {
assert_eq!(dag.get(task)?, i);
}
@@ -107,16 +107,18 @@ async fn test_concurrent_dependency_resolution() -> DagResult<()> {
let resolution_counter = Arc::new(AtomicUsize::new(0));
// Create a source task
let source = dag.add_task(task_fn({
let counter = resolution_counter.clone();
move |_: ()| {
let counter = counter.clone();
async move {
counter.fetch_add(1, Ordering::SeqCst);
42
let source: TaskHandle<_> = dag
.add_task(task_fn({
let counter = resolution_counter.clone();
move |_: ()| {
let counter = counter.clone();
async move {
counter.fetch_add(1, Ordering::SeqCst);
42
}
}
}
}));
}))
.into();
// Create many tasks depending on the same source
let dependents: Vec<_> = (0..100)
@@ -129,7 +131,7 @@ async fn test_concurrent_dependency_resolution() -> DagResult<()> {
val + i
}
}))
.depends_on(&source)
.depends_on(source)
})
.collect();
@@ -166,6 +168,7 @@ async fn test_read_write_race_patterns() -> DagResult<()> {
i
}
}))
.into()
})
.collect();
@@ -284,7 +287,7 @@ async fn test_multiple_dag_runners_interaction() -> DagResult<()> {
// Collect results
let mut results = Vec::new();
for task in tasks {
results.push(dag.get(&task)?);
results.push(dag.get(task)?);
}
Ok::<_, dagx::DagError>(results)
+20 -17
View File
@@ -1,7 +1,7 @@
//! Tests for forced execution interleaving patterns
use crate::common::task_fn;
use dagx::{DagResult, DagRunner};
use dagx::{DagResult, DagRunner, TaskHandle};
use futures::FutureExt;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::Arc;
@@ -65,7 +65,7 @@ async fn test_forced_interleaving_with_barriers() -> DagResult<()> {
.add_task(task_fn(
|(a, b, c): (i32, i32, i32)| async move { a + b + c },
))
.depends_on((&t1, &t2, &t3));
.depends_on((t1, t2, t3));
dag.run(|fut| tokio::spawn(fut).map(Result::unwrap)).await?;
@@ -110,7 +110,7 @@ async fn test_alternating_execution_pattern() -> DagResult<()> {
}
}
}));
let mut chain_a: dagx::TaskHandle<i32> = (&first_a).into();
let mut chain_a: dagx::TaskHandle<i32> = first_a.into();
let first_b = dag.add_task(task_fn({
let turn = turn.clone();
@@ -128,7 +128,7 @@ async fn test_alternating_execution_pattern() -> DagResult<()> {
}
}
}));
let mut chain_b: dagx::TaskHandle<i32> = (&first_b).into();
let mut chain_b: dagx::TaskHandle<i32> = first_b.into();
for i in 1..5 {
let turn_clone = turn.clone();
@@ -197,6 +197,7 @@ async fn test_layered_interleaving() -> DagResult<()> {
i as i32
}
}))
.into()
})
.collect();
@@ -250,19 +251,21 @@ async fn test_cross_branch_synchronization() -> DagResult<()> {
let events = Arc::new(parking_lot::Mutex::new(Vec::new()));
// Branch A
let a1 = dag.add_task(task_fn({
let sync = sync_point.clone();
let events = events.clone();
move |_: ()| {
let sync = sync.clone();
let a1: TaskHandle<_> = dag
.add_task(task_fn({
let sync = sync_point.clone();
let events = events.clone();
async move {
events.lock().push("A1");
sync.fetch_add(1, Ordering::SeqCst);
1
move |_: ()| {
let sync = sync.clone();
let events = events.clone();
async move {
events.lock().push("A1");
sync.fetch_add(1, Ordering::SeqCst);
1
}
}
}
}));
}))
.into();
let a2 = dag
.add_task(task_fn({
@@ -282,7 +285,7 @@ async fn test_cross_branch_synchronization() -> DagResult<()> {
}
}
}))
.depends_on(&a1);
.depends_on(a1);
// Branch B
let b1 = dag.add_task(task_fn({
@@ -320,7 +323,7 @@ async fn test_cross_branch_synchronization() -> DagResult<()> {
}
}
}))
.depends_on(&b1);
.depends_on(b1);
// Merge
let merge = dag