Skip to content
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

Jump to bottom

dyndep support #48

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

dyndep support #48

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d31908c
env: add edgevarbool; 0 length is false
Duncaen Apr 10, 2020
c9e3d88
build: split dirty computation from buildadd into computedirty
Duncaen Apr 10, 2020
d5a38ce
build: edgedone: prune all output nodes if one is being pruned
Duncaen Apr 10, 2020
c85b980
build: nodedone: mark finished nodes clean
Duncaen Apr 10, 2020
e8d4fe8
graph: add dyndep support
Duncaen Apr 10, 2020
ed567a1
build: add buildupdate function used by dyndeps
Duncaen Apr 10, 2020
b657621
dyndep: add initial dyndep support
Duncaen Apr 10, 2020
6831323
log: create nodes if they don't exist so dyndeps can use logmtime
Duncaen Apr 10, 2020
4d83d89
graph: add FLAG_QUEUED to avoid requeueing dyndeps
Duncaen Apr 10, 2020
7d7caf0
build: edgedone: mark edges clean
Duncaen Apr 10, 2020
6d5a571
dyndep: don't add edges with dyndeps to the build if they haven't bee…
Duncaen Apr 10, 2020
f5d3177
build: buildupdate: fix total count for dyndeps
Duncaen Apr 10, 2020
01afc10
parse/dyndep: fix checkversion
Duncaen Apr 10, 2020
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
55 changes: 32 additions & 23 deletions build.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,43 @@ queue(struct edge *e)
*front = e;
}

static void
computedirty(struct edge *e, struct node *newest)
{
struct node *n;
size_t i;
bool generator, restat;

/* all outputs are dirty if any are older than the newest input */
generator = edgevarbool(e, "generator");
restat = edgevarbool(e, "restat");
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just checking, does ninja treat set-but-empty generator and restat as false?

for (i = 0; i < e->nout && !(e->flags & FLAG_DIRTY_OUT); ++i) {
n = e->out[i];
if (isdirty(n, newest, generator, restat)) {
n->dirty = true;
e->flags |= FLAG_DIRTY_OUT;
}
}
if (e->flags & FLAG_DIRTY) {
for (i = 0; i < e->nout; ++i) {
n = e->out[i];
if (buildopts.explain && !n->dirty) {
if (e->flags & FLAG_DIRTY_IN)
warn("explain %s: input is dirty", n->path->s);
else if (e->flags & FLAG_DIRTY_OUT)
warn("explain %s: output of generating action is dirty", n->path->s);
}
n->dirty = true;
}
}
}

void
buildadd(struct node *n)
{
struct edge *e;
struct node *newest;
size_t i;
bool generator, restat;

e = n->gen;
if (!e) {
Expand Down Expand Up @@ -158,28 +188,7 @@ buildadd(struct node *n)
if (n->dirty || (n->gen && n->gen->nblock > 0))
++e->nblock;
}
/* all outputs are dirty if any are older than the newest input */
generator = edgevar(e, "generator", true);
restat = edgevar(e, "restat", true);
for (i = 0; i < e->nout && !(e->flags & FLAG_DIRTY_OUT); ++i) {
n = e->out[i];
if (isdirty(n, newest, generator, restat)) {
n->dirty = true;
e->flags |= FLAG_DIRTY_OUT;
}
}
if (e->flags & FLAG_DIRTY) {
for (i = 0; i < e->nout; ++i) {
n = e->out[i];
if (buildopts.explain && !n->dirty) {
if (e->flags & FLAG_DIRTY_IN)
warn("explain %s: input is dirty", n->path->s);
else if (e->flags & FLAG_DIRTY_OUT)
warn("explain %s: output of generating action is dirty", n->path->s);
}
n->dirty = true;
}
}
computedirty(e, newest);
if (!(e->flags & FLAG_DIRTY_OUT))
e->nprune = e->nblock;
if (e->flags & FLAG_DIRTY) {
Expand Down