diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2019-08-22 16:08:45 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2019-08-22 16:16:32 +0200 |
| commit | 708b092956f10b5c05641f90d55b209e887d52de (patch) | |
| tree | 418b2ba2b214fc6af857d75301e5301d4fe0322b /build2/cc | |
| parent | 4f5b6cb7ed4e05e98cce7e692462f49e24b7a39a (diff) | |
Run phase
Diffstat (limited to 'build2/cc')
| -rw-r--r-- | build2/cc/compile-rule.cxx | 6 | ||||
| -rw-r--r-- | build2/cc/link-rule.cxx | 2 | ||||
| -rw-r--r-- | build2/cc/utility.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/build2/cc/compile-rule.cxx b/build2/cc/compile-rule.cxx index 9dede21..f600f76 100644 --- a/build2/cc/compile-rule.cxx +++ b/build2/cc/compile-rule.cxx @@ -559,7 +559,7 @@ namespace build2 // @@ MT perf: so we are going to switch the phase and execute for // any generated header. // - phase_switch ps (run_phase::execute); + phase_switch ps (t.ctx, run_phase::execute); target_state ns (execute_direct (a, t)); if (ns != os && ns != target_state::unchanged) @@ -698,7 +698,7 @@ namespace build2 // Start asynchronous matching of prerequisites. Wait with unlocked // phase to allow phase switching. // - wait_guard wg (target::count_busy (), t[a].task_count, true); + wait_guard wg (t.ctx, target::count_busy (), t[a].task_count, true); size_t start (pts.size ()); // Index of the first to be added. for (prerequisite_member p: group_prerequisite_members (a, t)) @@ -5113,7 +5113,7 @@ namespace build2 { // Switch the phase to load then create and load the subproject. // - phase_switch phs (run_phase::load); + phase_switch phs (rs.ctx, run_phase::load); // Re-test again now that we are in exclusive phase (another thread // could have already created and loaded the subproject). diff --git a/build2/cc/link-rule.cxx b/build2/cc/link-rule.cxx index 09109c2..57772a9 100644 --- a/build2/cc/link-rule.cxx +++ b/build2/cc/link-rule.cxx @@ -1198,7 +1198,7 @@ namespace build2 // Wait with unlocked phase to allow phase switching. // - wait_guard wg (target::count_busy (), t[a].task_count, true); + wait_guard wg (t.ctx, target::count_busy (), t[a].task_count, true); i = start; for (prerequisite_member p: group_prerequisite_members (a, t)) diff --git a/build2/cc/utility.cxx b/build2/cc/utility.cxx index ff807c9..e9d4ce3 100644 --- a/build2/cc/utility.cxx +++ b/build2/cc/utility.cxx @@ -70,7 +70,7 @@ namespace build2 // Called by the compile rule during execute. // - return phase == run_phase::match && !exist + return x.ctx.phase == run_phase::match && !exist ? &search (x, tt, x.dir, x.out, x.name) : search_existing (x.ctx, tt, x.dir, x.out, x.name); } |