Skip to content

Enforce the repair timeout when collecting repairs. #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ratmice merged 1 commit into from
Jan 3, 2025
Merged

Enforce the repair timeout when collecting repairs. #482

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions lrpar/src/lib/cpctplus.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,9 @@ where
return (in_laidx, vec![]);
}

let full_rprs = self.collect_repairs(in_laidx, astar_cnds);
let Some(full_rprs) = self.collect_repairs(finish_by, in_laidx, astar_cnds) else {
return (in_laidx, vec![]);
};
let mut rnk_rprs = rank_cnds(parser, finish_by, in_laidx, in_pstack, full_rprs);
if rnk_rprs.is_empty() {
return (in_laidx, vec![]);
Expand Down Expand Up @@ -372,19 +374,25 @@ where
}
}

/// Convert the output from `astar_all` into something more usable.
/// Convert the output from `astar_all` into something more usable. Returns `None` if it timed
/// out while doing so.
fn collect_repairs(
&self,
finish_by: Instant,
in_laidx: usize,
cnds: Vec<PathFNode<StorageT>>,
) -> Vec<Vec<Vec<ParseRepair<LexerTypesT::LexemeT, StorageT>>>> {
) -> Option<Vec<Vec<Vec<ParseRepair<LexerTypesT::LexemeT, StorageT>>>>> {
fn traverse<StorageT: PrimInt>(
finish_by: Instant,
rm: &Cactus<RepairMerge<StorageT>>,
) -> Vec<Vec<Repair<StorageT>>> {
) -> Option<Vec<Vec<Repair<StorageT>>>> {
if Instant::now() >= finish_by {
return None;
}
let mut out = Vec::new();
match *rm.val().unwrap() {
RepairMerge::Repair(r) => {
let parents = traverse(&rm.parent().unwrap());
let parents = traverse(finish_by, &rm.parent().unwrap())?;
if parents.is_empty() {
out.push(vec![r]);
} else {
Expand All @@ -395,7 +403,7 @@ where
}
}
RepairMerge::Merge(r, ref vc) => {
let parents = traverse(&rm.parent().unwrap());
let parents = traverse(finish_by, &rm.parent().unwrap())?;
if parents.is_empty() {
out.push(vec![r]);
} else {
Expand All @@ -405,26 +413,26 @@ where
}
}
for c in vc.vals() {
for pc in traverse(c) {
for pc in traverse(finish_by, c)? {
out.push(pc);
}
}
}
RepairMerge::Terminator => (),
}
out
Some(out)
}

let mut all_rprs = Vec::with_capacity(cnds.len());
for cnd in cnds {
all_rprs.push(
traverse(&cnd.repairs)
traverse(finish_by, &cnd.repairs)?
.into_iter()
.map(|x| self.repair_to_parse_repair(in_laidx, &x))
.collect::<Vec<_>>(),
);
}
all_rprs
Some(all_rprs)
}

fn repair_to_parse_repair(
Expand Down
Loading