From bee90675a701d7267caba40921b4606db5072247 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 7 Apr 2022 09:33:50 +0200 Subject: Rename {match,execute}() to *_sync(), add *_complete() In particular, the match() rename makes sure it doesn't clash with rule::match() which, after removal of the hint argument in simple_rule, has exactly the same signature, thus making it error-prone to calling recursively. --- libbuild2/adhoc-rule-buildscript.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libbuild2/adhoc-rule-buildscript.cxx') diff --git a/libbuild2/adhoc-rule-buildscript.cxx b/libbuild2/adhoc-rule-buildscript.cxx index 77c0823..78891b9 100644 --- a/libbuild2/adhoc-rule-buildscript.cxx +++ b/libbuild2/adhoc-rule-buildscript.cxx @@ -424,7 +424,7 @@ namespace build2 // unmatch um ((pt.include & 4) != 0 ? unmatch::safe : unmatch::none); - pair mr (build2::match (a, *pt.target, um)); + pair mr (match_complete (a, *pt.target, um)); if (um != unmatch::none) { @@ -1370,7 +1370,6 @@ namespace build2 // This is essentially a customized execute_prerequisites(a, t, mt). // size_t busy (ctx.count_busy ()); - size_t exec (ctx.count_executed ()); target_state rs (target_state::unchanged); @@ -1398,11 +1397,10 @@ namespace build2 (p.target != nullptr ? p.target : p.adhoc () ? reinterpret_cast (p.data) : nullptr)) { - ctx.sched.wait (exec, (*pt)[a].task_count, scheduler::work_none); + target_state s (execute_complete (a, *pt)); if (p.data == 0) { - target_state s (pt->executed_state (a)); rs |= s; // Compare our timestamp to this prerequisite's skipping -- cgit v1.1