aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2023-05-25 09:45:01 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2023-05-29 10:21:12 +0200
commit9650726961a281ea982660c2cc82d4da046b5622 (patch)
tree9cbcb422381695756a352b0df14c9a8852a16d9d
parente05f7c7383cc48823bd408c0bc5187191a9a1c48 (diff)
Explicit group: dynamic members
-rw-r--r--libbuild2/adhoc-rule-buildscript.cxx313
-rw-r--r--libbuild2/adhoc-rule-buildscript.hxx5
-rw-r--r--libbuild2/build/script/parser.cxx101
-rw-r--r--libbuild2/build/script/parser.hxx4
-rw-r--r--libbuild2/dyndep.cxx90
-rw-r--r--libbuild2/dyndep.hxx23
-rw-r--r--libbuild2/file.cxx2
-rw-r--r--libbuild2/parser.cxx4
-rw-r--r--libbuild2/target.hxx9
-rw-r--r--libbuild2/target.ixx9
10 files changed, 426 insertions, 134 deletions
diff --git a/libbuild2/adhoc-rule-buildscript.cxx b/libbuild2/adhoc-rule-buildscript.cxx
index 62f3594..7c987f1 100644
--- a/libbuild2/adhoc-rule-buildscript.cxx
+++ b/libbuild2/adhoc-rule-buildscript.cxx
@@ -330,6 +330,10 @@ namespace build2
//
if (pattern != nullptr)
{
+ // @@ TODO: expl: pattern: if first must be file, we should probably add
+ // them after the group's static_members. Suppress duplicates that
+ // are already in group::static_members.
+
pattern->apply_adhoc_members (a, t, bs, me);
// A pattern rule that matches an explicit group should not inject any
@@ -348,6 +352,10 @@ namespace build2
{
g->reset_members (a); // See group::group_members() for background.
+ // Note that we rely on the fact that if the group has static members,
+ // then they always come first in members and the first static member
+ // is a file.
+ //
for (const target& m: g->static_members)
{
if (auto* p = m.is_a<path_target> ())
@@ -356,9 +364,11 @@ namespace build2
g->members.push_back (&m);
}
- if (g->members.empty ())
+ g->members_static = g->members.size ();
+
+ if (g->members_static == 0)
{
- if (!script.depdb_dyndep_dyn_target) // @@ TODO: expl: first must file
+ if (!script.depdb_dyndep_dyn_target)
fail << "group " << *g << " has no static or dynamic members";
}
else if (!g->members.front ()->is_a<file> ())
@@ -383,7 +393,8 @@ namespace build2
{
// This could be, for example, configure/dist update which could need a
// "representative sample" of members (in order to be able to match the
- // rules). So add static members if there aren't any.
+ // rules). So add static members unless we already have something
+ // cached.
//
if (g->group_members (a).members == nullptr) // Note: not g->member.
{
@@ -391,6 +402,8 @@ namespace build2
for (const target& m: g->static_members)
g->members.push_back (&m);
+
+ g->members_static = g->members.size ();
}
}
@@ -590,6 +603,21 @@ namespace build2
return r;
};
+ // Target path to derive the depdb path, query mtime (if file), etc.
+ //
+ // To derive the depdb path for a group with at least one static member we
+ // use the path of the first member. For a group without any static
+ // members we use the group name with the target type name as the
+ // second-level extension.
+ //
+ auto target_path = [&t, g, p = path ()] () mutable -> const path&
+ {
+ return
+ g == nullptr ? t.as<file> ().path () :
+ g->members_static != 0 ? g->members.front ()->as<file> ().path () :
+ (p = g->dir / (g->name + '.' + g->type ().name));
+ };
+
// See if we are providing the standard clean as a fallback.
//
if (me.fallback)
@@ -598,14 +626,15 @@ namespace build2
//
if (script.depdb_dyndep_dyn_target)
{
- file& ft (t.as<file> ()); // @@ TODO: expl
-
// Note that only removing the relevant filesystem entries is not
// enough: we actually have to populate the group with members since
// this information could be used to clean derived targets (for
// example, object files). So we just do that and let the standard
// clean logic take care of them the same as static members.
//
+ // NOTE that this logic should be consistent with what we have in
+ // exec_depdb_dyndep().
+ //
using dyndep = dyndep_rule;
function<dyndep::map_extension_func> map_ext (
@@ -614,38 +643,58 @@ namespace build2
return dyndep::map_extension (bs, n, e, nullptr);
});
- // @@ TODO: expl
+ function<dyndep::group_filter_func> filter;
+ if (g != nullptr)
+ {
+ filter = [] (mtime_target& g, const build2::file& m)
+ {
+ auto& ms (g.as<group> ().members);
+ return find (ms.begin (), ms.end (), &m) == ms.end ();
+ };
+ }
+
+ // @@ We don't have --target-what, --target-default-type here. Could
+ // we do the same thing as byproduct to get them? That would
+ // require us running the first half of the depdb preamble but
+ // ignoring all the depdb builtins (we still want all the variable
+ // assignments -- maybe we could automatically skip them if we see
+ // depdb is not open). Wonder if there would be any other
+ // complications...
+ //
+ // BTW, this sort of works for --target-default-type since we just
+ // clean them as file{} targets (but diagnostics is off). It does
+ // break, however, if there is s batch, since then we end up
+ // detecting different targets sharing a path. This will also not
+ // work at all if/when we support specifying custom extension to
+ // type mapping in order to resolve ambiguities.
//
- // - depdb name?
+ const char* what ("file");
+ const target_type& def_tt (file::static_type);
- for (path& f: read_dyn_targets (ft.path () + ".d"))
+ for (path& f: read_dyn_targets (target_path () + ".d"))
{
-
- // Note that this logic should be consistent with what we have in
- // exec_depdb_dyndep().
- //
- // Note that here we don't bother cleaning any old dynamic targets
- // -- the more we can clean, the merrier.
- //
- // @@ We don't have --target-what, --target-default-type here.
- // Could we do the same thing as byproduct to get them? That
- // would require us running the first half of the depdb preamble
- // but ignoring all the depdb builtins (we still want all the
- // variable assignments -- maybe we could automatically skip them
- // if we see depdb is not open). Wonder if there would be any
- // other complications...
- //
- // BTW, this sort of works for --target-default-type since we
- // just clean them as file{} targets (but diagnostics is off). It
- // does break, however, if there is s batch, since then we end up
- // detecting different targets sharing a path. This will also not
- // work at all if/when we support specifying custom extension to
- // type mapping in order to resolve ambiguities.
- //
- dyndep::inject_adhoc_group_member ("file",
- a, bs, ft,
- move (f),
- map_ext, file::static_type);
+ if (g != nullptr)
+ {
+ pair<const build2::file&, bool> r (
+ dyndep::inject_group_member (
+ what,
+ a, bs, *g,
+ move (f),
+ map_ext, def_tt, filter));
+
+ if (r.second)
+ g->members.push_back (&r.first);
+ }
+ else
+ {
+ // Note that here we don't bother cleaning any old dynamic targets
+ // -- the more we can clean, the merrier.
+ //
+ dyndep::inject_adhoc_group_member (what,
+ a, bs, t,
+ move (f),
+ map_ext, def_tt);
+ }
}
}
@@ -686,6 +735,8 @@ namespace build2
}
}
+ // This is a perform update on a file or group target.
+ //
// See if this is the simple case with only static dependencies.
//
if (!script.depdb_dyndep)
@@ -762,10 +813,7 @@ namespace build2
}
}
- assert (g != nullptr); // @@ TODO: expl
-
- file& ft (t.as<file> ());
- const path& tp (ft.path ());
+ const path& tp (target_path ());
// Note that while it's tempting to turn match_data* into recipes, some of
// their members are not movable. And in the end we will have the same
@@ -847,16 +895,27 @@ namespace build2
// Static targets and prerequisites (there can also be dynamic targets;
// see dyndep --dyn-target).
//
- // There is a nuance: in an operation batch (e.g., `b update update`) we
- // will already have the dynamic targets as members on the subsequent
- // operations and we need to make sure we don't treat them as static.
- // Using target_decl to distinguish the two seems like a natural way.
- //
{
sha256 tcs;
- for (const target* m (&t); m != nullptr; m = m->adhoc_member)
+ if (g == nullptr)
{
- if (m->decl == target_decl::real)
+ // There is a nuance: in an operation batch (e.g., `b update
+ // update`) we will already have the dynamic targets as members on
+ // the subsequent operations and we need to make sure we don't treat
+ // them as static. Using target_decl to distinguish the two seems
+ // like a natural way.
+ //
+ for (const target* m (&t); m != nullptr; m = m->adhoc_member)
+ {
+ if (m->decl == target_decl::real)
+ hash_target (tcs, *m, storage);
+ }
+ }
+ else
+ {
+ // Feels like there is not much sense in hashing the group itself.
+ //
+ for (const target* m: g->members)
hash_target (tcs, *m, storage);
}
@@ -892,19 +951,39 @@ namespace build2
// Determine if we need to do an update based on the above checks.
//
- bool update;
+ bool update (false);
timestamp mt;
if (dd.writing ())
update = true;
else
{
- // @@ TODO: expl mtime
+ if (g == nullptr)
+ {
+ const file& ft (t.as<file> ());
- if ((mt = ft.mtime ()) == timestamp_unknown)
- ft.mtime (mt = mtime (tp)); // Cache.
+ if ((mt = ft.mtime ()) == timestamp_unknown)
+ ft.mtime (mt = mtime (tp)); // Cache.
+ }
+ else
+ {
+ // Use static member, old dynamic, or force update.
+ //
+ const path* p (
+ g->members_static != 0
+ ? &tp /* first static member path */
+ : (md != nullptr && !md->old_dyn_targets.empty ()
+ ? &md->old_dyn_targets.front ()
+ : nullptr));
+
+ if (p != nullptr)
+ mt = g->load_mtime (*p);
+ else
+ update = true;
+ }
- update = dd.mtime > mt;
+ if (!update)
+ update = dd.mtime > mt;
}
if (update)
@@ -934,7 +1013,7 @@ namespace build2
{
build::script::parser p (ctx);
mdb->byp = p.execute_depdb_preamble_dyndep_byproduct (
- a, bs, ft, // @@ TODO: expl
+ a, bs, t,
env, script, run,
dd, update, mt);
}
@@ -1052,7 +1131,7 @@ namespace build2
return [this, md = move (mdb)] (action a, const target& t)
{
- return perform_update_file_dyndep_byproduct (a, t, *md);
+ return perform_update_file_or_group_dyndep_byproduct (a, t, *md);
};
}
else
@@ -1067,7 +1146,7 @@ namespace build2
md->deferred_failure = false;
{
build::script::parser p (ctx);
- p.execute_depdb_preamble_dyndep (a, bs, ft, // @@ TODO: expl
+ p.execute_depdb_preamble_dyndep (a, bs, t,
env, script, run,
dd,
md->dyn_targets,
@@ -1089,23 +1168,31 @@ namespace build2
return [this, md = move (md)] (action a, const target& t)
{
- return perform_update_file_dyndep (a, t, *md);
+ return perform_update_file_or_group_dyndep (a, t, *md);
};
}
}
target_state adhoc_buildscript_rule::
- perform_update_file_dyndep_byproduct (action a,
- const target& xt,
- match_data_byproduct& md) const
+ perform_update_file_or_group_dyndep_byproduct (
+ action a, const target& t, match_data_byproduct& md) const
{
// Note: using shared function name among the three variants.
//
- tracer trace ("adhoc_buildscript_rule::perform_update_file");
+ tracer trace (
+ "adhoc_buildscript_rule::perform_update_file_or_group_dyndep_byproduct");
- context& ctx (xt.ctx);
+ context& ctx (t.ctx);
- const file& t (xt.as<file> ());
+ // For a group we use the first (for now static) member as a source of
+ // mtime.
+ //
+ // @@ TODO: expl: byproduct: Note that until we support dynamic targets in
+ // the byproduct mode, we verify there is at least one static member in
+ // apply() above. Once we do support this, we will need to verify after
+ // the dependency extraction below.
+ //
+ const group* g (t.is_a<group> ());
// Note that even if we've updated all our prerequisites in apply(), we
// still need to execute them here to keep the dependency counts straight.
@@ -1134,7 +1221,14 @@ namespace build2
if (!ctx.dry_run || verb != 0)
{
- execute_update_file (bs, a, t, env, run);
+ if (g == nullptr)
+ execute_update_file (bs, a, t.as<file> (), env, run);
+ else
+ {
+ // Note: no dynamic members yet.
+ //
+ execute_update_group (bs, a, *g, env, run);
+ }
}
// Extract the dynamic dependency information as byproduct of the recipe
@@ -1174,7 +1268,7 @@ namespace build2
const auto& pts (t.prerequisite_targets[a]);
auto add = [&trace, what,
- a, &bs, &t, &pts, pts_n = md.pts_n,
+ a, &bs, &t, g, &pts, pts_n = md.pts_n,
&byp, &map_ext, &dd, &skip] (path fp)
{
normalize_external (fp, what);
@@ -1212,15 +1306,25 @@ namespace build2
}
}
- // Skip if this is one of the targets.
+ // Skip if this is one of the targets (see the non-byproduct version
+ // for background).
//
if (byp.drop_cycles)
{
- for (const target* m (&t); m != nullptr; m = m->adhoc_member)
+ if (g != nullptr)
{
- if (ft == m)
+ auto& ms (g->members);
+ if (find (ms.begin (), ms.end (), ft) != ms.end ())
return;
}
+ else
+ {
+ for (const target* m (&t); m != nullptr; m = m->adhoc_member)
+ {
+ if (ft == m)
+ return;
+ }
+ }
}
// Skip until where we left off.
@@ -1332,6 +1436,8 @@ namespace build2
dd.expect ("");
dd.close ();
+ //@@ TODO: expl: byproduct: verify have at least one member.
+
md.dd.path = move (dd.path); // For mtime check below.
}
@@ -1340,20 +1446,38 @@ namespace build2
timestamp now (system_clock::now ());
if (!ctx.dry_run)
- depdb::check_mtime (start, md.dd.path, t.path (), now);
+ {
+ // Only now we know for sure there must be a member in the group.
+ //
+ const file& ft ((g == nullptr ? t : *g->members.front ()).as<file> ());
+
+ depdb::check_mtime (start, md.dd.path, ft.path (), now);
+ }
+
+ (g == nullptr
+ ? static_cast<const mtime_target&> (t.as<file> ())
+ : static_cast<const mtime_target&> (*g)).mtime (now);
- t.mtime (now);
return target_state::changed;
}
target_state adhoc_buildscript_rule::
- perform_update_file_dyndep (action a, const target& xt, match_data& md) const
+ perform_update_file_or_group_dyndep (
+ action a, const target& t, match_data& md) const
{
- tracer trace ("adhoc_buildscript_rule::perform_update_file");
+ tracer trace (
+ "adhoc_buildscript_rule::perform_update_file_or_group_dyndep");
- context& ctx (xt.ctx);
+ context& ctx (t.ctx);
- const file& t (xt.as<file> ());
+ // For a group we use the first (static or dynamic) member as a source of
+ // mtime. Note that in this case there must be at least one since we fail
+ // if we were unable to extract any dynamic members and there are no
+ // static (see exec_depdb_dyndep()).
+ //
+ const group* g (t.is_a<group> ());
+
+ const file& ft ((g == nullptr ? t : *g->members.front ()).as<file> ());
// Note that even if we've updated all our prerequisites in apply(), we
// still need to execute them here to keep the dependency counts straight.
@@ -1406,7 +1530,10 @@ namespace build2
if (!ctx.dry_run || verb != 0)
{
- execute_update_file (*md.bs, a, t, env, run, md.deferred_failure);
+ if (g == nullptr)
+ execute_update_file (*md.bs, a, ft, env, run, md.deferred_failure);
+ else
+ execute_update_group (*md.bs, a, *g, env, run, md.deferred_failure);
}
run.leave (env, script.end_loc);
@@ -1414,9 +1541,12 @@ namespace build2
timestamp now (system_clock::now ());
if (!ctx.dry_run)
- depdb::check_mtime (start, md.dd, t.path (), now);
+ depdb::check_mtime (start, md.dd, ft.path (), now);
+
+ (g == nullptr
+ ? static_cast<const mtime_target&> (ft)
+ : static_cast<const mtime_target&> (*g)).mtime (now);
- t.mtime (now);
return target_state::changed;
}
@@ -1429,7 +1559,9 @@ namespace build2
const scope& bs (t.base_scope ());
// For a group we use the first (static) member to derive depdb path, as a
- // source of mtime, etc.
+ // source of mtime, etc. Note that in this case there must be a static
+ // member since in this version of perform_update we don't extract dynamic
+ // dependencies (see apply() details).
//
const group* g (t.is_a<group> ());
@@ -1642,8 +1774,10 @@ namespace build2
if (r || depdb_preamble)
run.leave (env, script.end_loc);
- const auto& m (g == nullptr ? static_cast<const mtime_target&> (ft) : *g);
- m.mtime (system_clock::now ());
+ (g == nullptr
+ ? static_cast<const mtime_target&> (ft)
+ : static_cast<const mtime_target&> (*g)).mtime (system_clock::now ());
+
return target_state::changed;
}
@@ -1897,6 +2031,10 @@ namespace build2
{
// Note: similar to execute_update_file() above (see there for comments).
//
+ // NOTE: when called from perform_update_file_or_group_dyndep_byproduct(),
+ // the group does not contain dynamic members yet and thus could
+ // have no members at all.
+ //
context& ctx (g.ctx);
const scope& rs (*bs.root_scope ());
@@ -1947,6 +2085,9 @@ namespace build2
// On failure remove the target files that may potentially exist but
// be invalid.
//
+ // Note: we may leave dynamic members if we don't know about them yet.
+ // Feels natural enough.
+ //
small_vector<auto_rmfile, 8> rms;
if (!ctx.dry_run)
@@ -1973,6 +2114,12 @@ namespace build2
if (deferred_failure)
fail << "expected error exit status from recipe body";
+ // @@ TODO: expl: byproduct
+ //
+ // Note: will not work for dynamic members if we don't know about them
+ // yet. Could probably fix by doing this later, after the dynamic
+ // dependency extraction.
+ //
#ifndef _WIN32
auto chmod = [] (const path& p)
{
@@ -2027,14 +2174,20 @@ namespace build2
const group& g (xt.as<group> ());
path d, t;
- if (!g.static_members.empty ())
+ if (g.members_static != 0)
{
- const path& p (g.static_members.front ().get ().as<file> ().path ());
+ const path& p (g.members.front ()->as<file> ().path ());
d = p + ".d";
t = p + ".t";
}
else
- assert (false); // @@ TODO: expl
+ {
+ // See target_path lambda in apply().
+ //
+ t = g.dir / (g.name + '.' + g.type ().name);
+ d = t + ".d";
+ t += ".t";
+ }
return perform_clean_group_extra (a, g, {d.string ().c_str (),
t.string ().c_str ()});
diff --git a/libbuild2/adhoc-rule-buildscript.hxx b/libbuild2/adhoc-rule-buildscript.hxx
index 13b272f..994b18c 100644
--- a/libbuild2/adhoc-rule-buildscript.hxx
+++ b/libbuild2/adhoc-rule-buildscript.hxx
@@ -42,10 +42,11 @@ namespace build2
struct match_data_byproduct;
target_state
- perform_update_file_dyndep (action, const target&, match_data&) const;
+ perform_update_file_or_group_dyndep (
+ action, const target&, match_data&) const;
target_state
- perform_update_file_dyndep_byproduct (
+ perform_update_file_or_group_dyndep_byproduct (
action, const target&, match_data_byproduct&) const;
optional<target_state>
diff --git a/libbuild2/build/script/parser.cxx b/libbuild2/build/script/parser.cxx
index c71f218..d61b7d7 100644
--- a/libbuild2/build/script/parser.cxx
+++ b/libbuild2/build/script/parser.cxx
@@ -2240,6 +2240,8 @@ namespace build2
const scope& rs (*bs.root_scope ());
+ group* g (t.is_a<group> ()); // If not group then file.
+
// This code is based on the prior work in the cc module (specifically
// extract_headers()) where you can often find more detailed rationale
// for some of the steps performed.
@@ -2389,7 +2391,7 @@ namespace build2
size_t skip_count (0);
auto add = [this, &trace, what,
- a, &bs, &t, &pts, pts_n = pts.size (),
+ a, &bs, &t, g, &pts, pts_n = pts.size (),
&ops, &map_ext, def_pt, &pfx_map, &so_map,
&dd, &skip_count] (path fp,
size_t* skip,
@@ -2453,15 +2455,26 @@ namespace build2
// Skip if this is one of the targets.
//
+ // Note that for dynamic targets this only works if we see the
+ // targets before prerequisites (like in the make dependency
+ // format).
+ //
if (ops.drop_cycles ())
{
- // @@ TODO: expl
-
- for (const target* m (&t); m != nullptr; m = m->adhoc_member)
+ if (g != nullptr)
{
- if (ft == m)
+ auto& ms (g->members);
+ if (find (ms.begin (), ms.end (), ft) != ms.end ())
return false;
}
+ else
+ {
+ for (const target* m (&t); m != nullptr; m = m->adhoc_member)
+ {
+ if (ft == m)
+ return false;
+ }
+ }
}
// Skip until where we left off.
@@ -2866,6 +2879,9 @@ namespace build2
//
if (dyn_tgt)
{
+ if (g != nullptr && g->members_static == 0 && dyn_targets.empty ())
+ fail (ll) << "group " << *g << " has no static or dynamic members";
+
// There is one more level (at least that we know of) to this rabbit
// hole: if the set of dynamic targets changes between clean and
// update and we do a `clean update` batch, then we will end up with
@@ -2875,11 +2891,29 @@ namespace build2
// Optimize this for a first/single batch (common case) by noticing
// that there are only real targets to start with.
//
+ // Note that this doesn't affect explicit groups where we reset the
+ // members on each update (see adhoc_rule_buildscript::apply()).
+ //
optional<vector<const target*>> dts;
- for (const target* m (&t); m != nullptr; m = m->adhoc_member) // @@ TODO: expl
+ if (g == nullptr)
+ {
+ for (const target* m (&t); m != nullptr; m = m->adhoc_member)
+ {
+ if (m->decl != target_decl::real)
+ dts = vector<const target*> ();
+ }
+ }
+
+ function<dyndep::group_filter_func> filter;
+ if (g != nullptr)
{
- if (m->decl != target_decl::real)
- dts = vector<const target*> ();
+ // Skip static/duplicate members in explicit group.
+ //
+ filter = [] (mtime_target& g, const build2::file& m)
+ {
+ auto& ms (g.as<group> ().members);
+ return find (ms.begin (), ms.end (), &m) == ms.end ();
+ };
}
for (const path& f: dyn_targets)
@@ -2887,24 +2921,47 @@ namespace build2
// Note that this logic should be consistent with what we have in
// adhoc_buildscript_rule::apply() for perform_clean.
//
- pair<const build2::file&, bool> r (
- dyndep::inject_adhoc_group_member (
- what_tgt,
- a, bs, t,
- f, // Can't move since need to return dyn_targets.
- map_ext, *def_tt));
+ if (g != nullptr)
+ {
+ pair<const build2::file&, bool> r (
+ dyndep::inject_group_member (
+ what_tgt,
+ a, bs, *g,
+ f, // Can't move since need to return dyn_targets.
+ map_ext, *def_tt, filter));
+
+ // Note: no target_decl shenanigans since reset the members on
+ // each update.
+ //
+ if (!r.second)
+ continue;
- // Note that we have to track the dynamic target even if it was
- // already a member (think `b update && b clean update`).
- //
- if (r.second || r.first.decl != target_decl::real)
+ // Note: we only currently support dynamic file members so it
+ // will be file if first.
+ //
+ g->members.push_back (&r.first);
+ }
+ else
{
- if (!cache)
- dd.expect (f);
+ pair<const build2::file&, bool> r (
+ dyndep::inject_adhoc_group_member (
+ what_tgt,
+ a, bs, t,
+ f, // Can't move since need to return dyn_targets.
+ map_ext, *def_tt));
+
+ // Note that we have to track the dynamic target even if it was
+ // already a member (think `b update && b clean update`).
+ //
+ if (!r.second && r.first.decl == target_decl::real)
+ continue;
if (dts)
dts->push_back (&r.first);
}
+
+ if (!cache)
+ dd.expect (f);
}
// Add the dynamic targets terminating blank line.
@@ -2916,7 +2973,9 @@ namespace build2
//
if (dts)
{
- for (target* p (&t); p->adhoc_member != nullptr; ) // @@ TODO: expl
+ assert (g == nullptr);
+
+ for (target* p (&t); p->adhoc_member != nullptr; )
{
target* m (p->adhoc_member);
diff --git a/libbuild2/build/script/parser.hxx b/libbuild2/build/script/parser.hxx
index 856ad64..7417e9e 100644
--- a/libbuild2/build/script/parser.hxx
+++ b/libbuild2/build/script/parser.hxx
@@ -123,7 +123,7 @@ namespace build2
void
execute_depdb_preamble_dyndep (
- action a, const scope& base, file& t,
+ action a, const scope& base, target& t,
environment& e, const script& s, runner& r,
depdb& dd,
paths& dyn_targets,
@@ -158,7 +158,7 @@ namespace build2
dyndep_byproduct
execute_depdb_preamble_dyndep_byproduct (
- action a, const scope& base, const file& t,
+ action a, const scope& base, const target& t,
environment& e, const script& s, runner& r,
depdb& dd, bool& update, timestamp mt)
{
diff --git a/libbuild2/dyndep.cxx b/libbuild2/dyndep.cxx
index b793de8..d34834e 100644
--- a/libbuild2/dyndep.cxx
+++ b/libbuild2/dyndep.cxx
@@ -827,32 +827,34 @@ namespace build2
map_ext, fallback, pfx_map, so_map);
}
- const file& dyndep_rule::
- inject_group_member (action a, const scope& bs, mtime_target& g,
- path p, const target_type& tt)
+ static pair<const file&, bool>
+ inject_group_member_impl (action a, const scope& bs, mtime_target& g,
+ path f, string n, string e,
+ const target_type& tt,
+ const function<dyndep_rule::group_filter_func>& fl)
{
- path n (p.leaf ());
- string e (n.extension ());
-
// Assume nobody else can insert these members (seems reasonable seeing
// that their names are dynamically discovered).
//
auto l (search_new_locked (
bs.ctx,
tt,
- p.directory (),
+ f.directory (),
dir_path (), // Always in out.
- move (n.make_base ()).string (),
+ move (n),
&e,
&bs));
const file& t (l.first.as<file> ()); // Note: non-const only if have lock.
+ if (fl != nullptr && !fl (g, t))
+ return pair<const file&, bool> (t, false);
+
if (l.second)
{
l.first.group = &g;
l.second.unlock ();
- t.path (move (p)); // Only do this once.
+ t.path (move (f)); // Only do this once.
}
else
// Must have been already done (e.g., on previous operation in a
@@ -869,25 +871,35 @@ namespace build2
match_inc_dependents (a, g);
match_recipe (tl, group_recipe);
- return t;
+ return pair<const file&, bool> (t, true);
}
- pair<const file&, bool> dyndep_rule::
- inject_adhoc_group_member (const char* what,
- action, const scope& bs, target& t,
- path f,
- const function<map_extension_func>& map_ext,
- const target_type& fallback)
+ const file& dyndep_rule::
+ inject_group_member (action a, const scope& bs, mtime_target& g,
+ path f, const target_type& tt)
{
path n (f.leaf ());
string e (n.extension ());
n.make_base ();
- // Map extension to the target type, falling back to def_tt.
+ return inject_group_member_impl (a, bs, g,
+ move (f), move (n).string (), move (e),
+ tt,
+ nullptr /* filter */).first;
+ }
+
+ static const target_type&
+ map_target_type (const char* what,
+ const scope& bs,
+ const path& f, const string& n, const string& e,
+ const function<dyndep_rule::map_extension_func>& map_ext,
+ const target_type& fallback)
+ {
+ // Map extension to the target type, falling back to the fallback type.
//
small_vector<const target_type*, 2> tts;
if (map_ext != nullptr)
- tts = map_ext (bs, n.string (), e);
+ tts = map_ext (bs, n, e);
// Not sure what else we can do in this case.
//
@@ -910,6 +922,48 @@ namespace build2
<< "target type " << tt.name << "{}";
}
+ return tt;
+ }
+
+ pair<const file&, bool> dyndep_rule::
+ inject_group_member (const char* what,
+ action a, const scope& bs, mtime_target& g,
+ path f,
+ const function<map_extension_func>& map_ext,
+ const target_type& fallback,
+ const function<group_filter_func>& filter)
+ {
+ path n (f.leaf ());
+ string e (n.extension ());
+ n.make_base ();
+
+ // Map extension to the target type, falling back to the fallback type.
+ //
+ const target_type& tt (
+ map_target_type (what, bs, f, n.string (), e, map_ext, fallback));
+
+ return inject_group_member_impl (a, bs, g,
+ move (f), move (n).string (), move (e),
+ tt,
+ filter);
+ }
+
+ pair<const file&, bool> dyndep_rule::
+ inject_adhoc_group_member (const char* what,
+ action, const scope& bs, target& t,
+ path f,
+ const function<map_extension_func>& map_ext,
+ const target_type& fallback)
+ {
+ path n (f.leaf ());
+ string e (n.extension ());
+ n.make_base ();
+
+ // Map extension to the target type, falling back to the fallback type.
+ //
+ const target_type& tt (
+ map_target_type (what, bs, f, n.string (), e, map_ext, fallback));
+
// Assume nobody else can insert these members (seems reasonable seeing
// that their names are dynamically discovered).
//
diff --git a/libbuild2/dyndep.hxx b/libbuild2/dyndep.hxx
index 6ae585e..0463215 100644
--- a/libbuild2/dyndep.hxx
+++ b/libbuild2/dyndep.hxx
@@ -243,12 +243,31 @@ namespace build2
template <typename T>
static const T&
- inject_group_member (action a, const scope& bs, mtime_target& g, path p)
+ inject_group_member (action a, const scope& bs, mtime_target& g, path f)
{
return inject_group_member (
- a, bs, g, move (p), T::static_type).template as<T> ();
+ a, bs, g, move (f), T::static_type).template as<T> ();
}
+ // As above but the target type is determined using the map_extension
+ // function if specified, falling back to the fallback type if unable to
+ // (the what argument is used for diagnostics during this process). Return
+ // the target and an indication of whether it was made a member.
+ //
+ // If specified, the group_filter function is called on the target before
+ // making it a group member, skipping it if this function returns false.
+ //
+ using group_filter_func = bool (mtime_target& g, const file&);
+
+ static pair<const file&, bool>
+ inject_group_member (const char* what,
+ action, const scope& base, mtime_target& g,
+ path,
+ const function<map_extension_func>&,
+ const target_type& fallback,
+ const function<group_filter_func>& = nullptr);
+
+
// Find or insert a target file path as a target, make it a member of the
// specified ad hoc group unless it already is, and set its path. Return
// the target and an indication of whether it was added as a member.
diff --git a/libbuild2/file.cxx b/libbuild2/file.cxx
index c22fff9..7a48b2e 100644
--- a/libbuild2/file.cxx
+++ b/libbuild2/file.cxx
@@ -219,7 +219,7 @@ namespace build2
// Checking for plausability feels expensive since we have to recursively
// traverse the directory tree. Note, however, that if the answer is
// positive, then shortly after we will be traversing this tree anyway and
- // presumably this time getting the data from the cash (we don't really
+ // presumably this time getting the data from the cache (we don't really
// care about the negative answer since this is a degenerate case).
//
optional<path> bf;
diff --git a/libbuild2/parser.cxx b/libbuild2/parser.cxx
index 45c56af..692e284 100644
--- a/libbuild2/parser.cxx
+++ b/libbuild2/parser.cxx
@@ -1267,8 +1267,8 @@ namespace build2
// rule for an explicit group that wishes to match based on some of
// its members feels far fetched.
//
- // @@ TODO: expl: this can be used to inject static members (which
- // otherwise would be tedious to repeat).
+ // @@ TODO: expl: pattern: this can be used to inject static members
+ // (which otherwise would be tedious to repeat).
//
const location& mloc (gns.empty () ? location () : gns[0].member_loc);
diff --git a/libbuild2/target.hxx b/libbuild2/target.hxx
index 428b4a0..3f73e63 100644
--- a/libbuild2/target.hxx
+++ b/libbuild2/target.hxx
@@ -1913,7 +1913,7 @@ namespace build2
dynamic_type = &static_type;
}
- // Modification time is an "atomic cash". That is, it can be set at any
+ // Modification time is an "atomic cache". That is, it can be set at any
// time (including on a const instance) and we assume everything will be
// ok regardless of the order in which racing updates happen because we do
// not modify the external state (which is the source of timestemps) while
@@ -1946,8 +1946,7 @@ namespace build2
// If the mtime is unknown, then load it from the filesystem also caching
// the result.
//
- // Note: can only be called during executing and must not be used if the
- // target state is group.
+ // Note: must not be used if the target state is group.
//
timestamp
load_mtime (const path&) const;
@@ -2008,7 +2007,7 @@ namespace build2
// Target path. Must be absolute and normalized.
//
- // Target path is an "atomic consistent cash". That is, it can be set at
+ // Target path is an "atomic consistent cache". That is, it can be set at
// any time (including on a const instance) but any subsequent updates
// must set the same path. Or, in other words, once the path is set, it
// never changes.
@@ -2185,6 +2184,7 @@ namespace build2
vector<const target*> members; // Layout compatible with group_view.
action members_action; // Action on which members were resolved.
size_t members_on = 0; // Operation number on which members were resolved.
+ size_t members_static; // Number of static ones in members (always first).
void
reset_members (action a)
@@ -2192,6 +2192,7 @@ namespace build2
members.clear ();
members_action = a;
members_on = ctx.current_on;
+ members_static = 0;
}
virtual group_view
diff --git a/libbuild2/target.ixx b/libbuild2/target.ixx
index 3f005c3..a550acb 100644
--- a/libbuild2/target.ixx
+++ b/libbuild2/target.ixx
@@ -720,8 +720,13 @@ namespace build2
inline timestamp mtime_target::
load_mtime (const path& p) const
{
- assert (ctx.phase == run_phase::execute &&
- !group_state (action () /* inner */));
+ // We can only enforce "not group state" during the execute phase. During
+ // match (e.g., the target is being matched), we will just have to pay
+ // attention.
+ //
+ assert (ctx.phase == run_phase::match ||
+ (ctx.phase == run_phase::execute &&
+ !group_state (action () /* inner */)));
duration::rep r (mtime_.load (memory_order_consume));
if (r == timestamp_unknown_rep)