graph: add dyndep support

Author: Duncaen

graph.c

@@ -58,6 +58,7 @@ mknode(struct string *path)
 	n = xmalloc(sizeof(*n));
 	n->path = path;
 	n->shellpath = NULL;
+	n->dyndep = NULL;
 	n->gen = NULL;
 	n->use = NULL;
 	n->nuse = 0;
@@ -152,6 +153,7 @@ mkedge(struct environment *parent)
 
 	e = xmalloc(sizeof(*e));
 	e->env = mkenv(parent);
+	e->dyndep = NULL;
 	e->pool = NULL;
 	e->out = NULL;
 	e->nout = 0;
@@ -227,3 +229,43 @@ edgeadddeps(struct edge *e, struct node **deps, size_t ndeps)
 	e->inorderidx += ndeps;
 	e->nin += ndeps;
 }
+
+void
+edgeadddyndeps(struct edge *e, struct node **deps, size_t ndeps)
+{
+	struct node **order, *n;
+	size_t norder, i;
+
+	for (i = 0; i < ndeps; ++i) {
+		n = deps[i];
+		if (!n->gen)
+			n->gen = mkphony(n);
+		nodeuse(n, e);
+	}
+	e->indynidx = e->inorderidx;
+	e->in = xreallocarray(e->in, e->nin + ndeps, sizeof(e->in[0]));
+	order = e->in + e->inorderidx;
+	norder = e->nin - e->inorderidx;
+	memmove(order + ndeps, order, norder * sizeof(e->in[0]));
+	memcpy(order, deps, ndeps * sizeof(e->in[0]));
+	e->inorderidx += ndeps;
+	e->nin += ndeps;
+}
+
+void
+edgeadddynouts(struct edge *e, struct node **outs, size_t nouts)
+{
+	struct node *n;
+	size_t i;
+
+	for (i = 0; i < nouts; ++i) {
+		n = outs[i];
+		if (n->gen && n->gen->rule != &phonyrule)
+			fatal("multiple rules generate '%s'", n->path->s);
+		n->gen = e;
+	}
+	e->outdynidx = e->nout;
+	e->out = xreallocarray(e->out, e->nout + nouts, sizeof(e->out[0]));
+	memcpy(e->out + e->nout, outs, nouts * sizeof(e->out[0]));
+	e->nout += nouts;
+}

graph.h

@@ -19,6 +19,9 @@ struct node {
 	struct edge *gen, **use;
 	size_t nuse;
 
+	/* dyndep or NULL if the node is not a dyndep */
+	struct dyndep *dyndep;
+
 	/* command hash used to build this output, read from build log */
 	uint64_t hash;
 
@@ -39,10 +42,13 @@ struct edge {
 	struct node **out, **in;
 	size_t nout, nin;
 
-	/* index of first implicit output */
-	size_t outimpidx;
-	/* index of first implicit and order-only input */
-	size_t inimpidx, inorderidx;
+	/* dyndep or NULL if the edge has no dyndep */
+	struct dyndep *dyndep;
+
+	/* index of first implicit adn dyndep output */
+	size_t outimpidx, outdynidx;
+	/* index of first implicit, dyndep and order-only input */
+	size_t inimpidx, indynidx, inorderidx;
 
 	/* command hash */
 	uint64_t hash;
@@ -60,6 +66,7 @@ struct edge {
 		FLAG_DIRTY     = FLAG_DIRTY_IN | FLAG_DIRTY_OUT,
 		FLAG_CYCLE     = 1 << 5,  /* used for cycle detection */
 		FLAG_DEPS      = 1 << 6,  /* dependencies loaded */
+		FLAG_DYNDEP    = 1 << 7,  /* dyndep loaded */
 	} flags;
 
 	/* used to coordinate ready work in build() */
@@ -87,6 +94,10 @@ struct edge *mkedge(struct environment *parent);
 void edgehash(struct edge *);
 /* add dependencies from $depfile or .ninja_deps as implicit inputs */
 void edgeadddeps(struct edge *e, struct node **deps, size_t ndeps);
+/* add dependencies from dyndep files as implicit inputs */
+void edgeadddyndeps(struct edge *e, struct node **deps, size_t ndeps);
+/* add outputs from dyndep as implicit outputs */
+void edgeadddynouts(struct edge *e, struct node **outs, size_t nouts);
 
 /* a single linked list of all edges, valid up until build() */
 extern struct edge *alledges;