diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-07-28 09:54:39 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-07-28 09:54:39 +0200 |
| commit | eace8edd98fe684e4631d9afb9be76ad3081f746 (patch) | |
| tree | ec0e701629b16095a68564d662e7d159dfdf2ef9 | |
| parent | 5e417ea840d51c20295f8772e8b4655065071b7d (diff) | |
Fix bug in target_count logic
| -rw-r--r-- | build2/algorithm.cxx | 8 | ||||
| -rw-r--r-- | build2/target.ixx | 9 |
2 files changed, 15 insertions, 2 deletions
diff --git a/build2/algorithm.cxx b/build2/algorithm.cxx index e702836..fa9787b 100644 --- a/build2/algorithm.cxx +++ b/build2/algorithm.cxx @@ -840,7 +840,13 @@ namespace build2 ts = t.recipe_ (a, t); - target_count.fetch_sub (1, memory_order_relaxed); + // Decrement the target count (see target::recipe() for details). + // + { + recipe_function** f (t.recipe_.target<recipe_function*> ()); + if (f == nullptr || *f != &group_action) + target_count.fetch_sub (1, memory_order_relaxed); + } // See the recipe documentation for details on what's going on here. // Note that if the result is group, then the group's state can be diff --git a/build2/target.ixx b/build2/target.ixx index 48036be..459265b 100644 --- a/build2/target.ixx +++ b/build2/target.ixx @@ -147,11 +147,18 @@ namespace build2 if (f != nullptr && *f == &noop_action) state_ = target_state::unchanged; else + { // This gets tricky when we start considering overrides (which can // only happen for noop recipes), direct execution, etc. So here seems // like the best place to do this. // - target_count.fetch_add (1, memory_order_relaxed); + // We also ignore the group recipe since it is used for ad hoc + // groups (which are not executed). Plus, group action means real + // recipe is in the group so this also feels right conceptually. + // + if (f == nullptr || *f != &group_action) + target_count.fetch_add (1, memory_order_relaxed); + } } } |