bert/tracing-mutex
1
0
Fork 0
mirror of https://github.com/bertptrs/tracing-mutex.git synced 2025-12-27 21:40:32 +01:00
Code Issues Projects Releases Wiki Activity

Replage edge lists with edge sets

Browse Source
This commit is contained in:
Bert Peters
2021-04-11 10:38:55 +02:00
parent c196589cfd
commit d3e146214f
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/graph.rs
View File

@@ -22,8 +22,8 @@ type Order = usize;
/// [paper]: https://whileydave.com/publications/pk07_jea/ /// [paper]: https://whileydave.com/publications/pk07_jea/
#[derive(Clone, Default, Debug)] #[derive(Clone, Default, Debug)]
pub struct DiGraph { pub struct DiGraph {
in_edges: HashMap<MutexId, Vec<MutexId>>, in_edges: HashMap<MutexId, HashSet<MutexId>>,
out_edges: HashMap<MutexId, Vec<MutexId>>, out_edges: HashMap<MutexId, HashSet<MutexId>>,
/// Next topological sort order /// Next topological sort order
next_ord: Order, next_ord: Order,
/// Poison flag, set if a cycle is detected when adding a new edge and /// Poison flag, set if a cycle is detected when adding a new edge and
@@ -42,7 +42,7 @@ impl DiGraph {
/// order. /// order.
/// ///
/// New nodes are appended to the end of the topological order when added. /// New nodes are appended to the end of the topological order when added.
fn add_node(&mut self, n: MutexId) -> (&mut Vec<MutexId>, &mut Vec<MutexId>, Order) { fn add_node(&mut self, n: MutexId) -> (&mut HashSet<MutexId>, &mut HashSet<MutexId>, Order) {
let next_ord = &mut self.next_ord; let next_ord = &mut self.next_ord;
let in_edges = self.in_edges.entry(n).or_default(); let in_edges = self.in_edges.entry(n).or_default();
let out_edges = self.out_edges.entry(n).or_default(); let out_edges = self.out_edges.entry(n).or_default();
@@ -61,11 +61,11 @@ impl DiGraph {
None => false, None => false,
Some(out_edges) => { Some(out_edges) => {
for other in out_edges { for other in out_edges {
self.in_edges.get_mut(&other).unwrap().retain(|c| c != &n); self.in_edges.get_mut(&other).unwrap().remove(&n);
} }
for other in self.in_edges.remove(&n).unwrap() { for other in self.in_edges.remove(&n).unwrap() {
self.out_edges.get_mut(&other).unwrap().retain(|c| c != &n); self.out_edges.get_mut(&other).unwrap().remove(&n);
} }
if self.contains_cycle { if self.contains_cycle {
@@ -89,16 +89,14 @@ impl DiGraph {
let (_, out_edges, ub) = self.add_node(x); let (_, out_edges, ub) = self.add_node(x);
if out_edges.contains(&y) { if !out_edges.insert(y) {
// Edge already exists, nothing to be done // Edge already exists, nothing to be done
return false; return false;
} }
out_edges.push(y);
let (in_edges, _, lb) = self.add_node(y); let (in_edges, _, lb) = self.add_node(y);
in_edges.push(x); in_edges.insert(x);
if !self.contains_cycle && lb < ub { if !self.contains_cycle && lb < ub {
// This edge might introduce a cycle, need to recompute the topological sort // This edge might introduce a cycle, need to recompute the topological sort