X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.h;h=fc92cd783c7dcd26a4717af2bbcca40d37f02351;hb=af5b1a18948345c5f9f9abf4eda3ab9fe0aa9a9f;hp=13b10dcdd2a3539ba19ad2f700225816111ec6ff;hpb=0ce66a11534211efcddc6f7f1be0ccad38d2258f;p=ccan

diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h
index 13b10dcd..fc92cd78 100644
--- a/tools/ccanlint/ccanlint.h
+++ b/tools/ccanlint/ccanlint.h
@@ -2,6 +2,7 @@
 #define CCAN_LINT_H
 #include "config.h"
 #include <ccan/list/list.h>
+#include <ccan/dgraph/dgraph.h>
 #include <stdbool.h>
 #include "../doc_extract.h"
 #include "licenses.h"
@@ -80,8 +81,6 @@ struct score {
 };
 
 struct ccanlint {
-	struct list_node list;
-
 	/* More concise unique name of test. */
 	const char *key;
 
@@ -91,12 +90,14 @@ struct ccanlint {
 	/* Can we run this test?  Return string explaining why, if not. */
 	const char *(*can_run)(struct manifest *m);
 
-	/* keep is set if you should keep the results.
-	 * If timeleft is set to 0, means it timed out.
+	/* Should we stop immediately if test fails? */
+	bool compulsory;
+
+	/* If timeleft is set to 0, means it timed out.
 	 * score is the result, and a talloc context freed after all our
 	 * depends are done. */
 	void (*check)(struct manifest *m,
-		      bool keep, unsigned int *timeleft, struct score *score);
+		      unsigned int *timeleft, struct score *score);
 
 	/* Can we do something about it? (NULL if not) */
 	void (*handle)(struct manifest *m, struct score *score);
@@ -110,16 +111,12 @@ struct ccanlint {
 	const char *needs;
 
 	/* Internal use fields: */
-	/* Who depends on us? */
-	struct list_head dependencies;
-	/* How many things do we (still) depend on? */
-	unsigned int num_depends;
+	/* We are a node in a dependency graph. */
+	struct dgraph_node node;
 	/* Did we skip a dependency?  If so, must skip this, too. */
 	const char *skip;
-	/* Did we fail a dependency?  If so, skip and mark as fail. */
-	bool skip_fail;
-	/* Did the user want to keep these results? */
-	bool keep_results;
+	/* Have we already run this? */
+	bool done;
 };
 
 /* Ask the user a yes/no question: the answer is NO if there's an error. */
@@ -239,6 +236,13 @@ void score_file_error(struct score *, struct ccan_file *f, unsigned line,
 void run_command_async(const void *ctx, unsigned int time_ms,
 		       const char *fmt, ...);
 
+/* Async version of compile_and_link. */
+void compile_and_link_async(const void *ctx, unsigned int time_ms,
+			    const char *cfile, const char *ccandir,
+			    const char *objs, const char *compiler,
+			    const char *cflags,
+			    const char *libs, const char *outfile);
+
 /* Get results of a command, returning ctx (and free it). */
 void *collect_command(bool *ok, char **output);
 
@@ -254,9 +258,15 @@ struct dependent {
 /* Is this test excluded (cmdline or _info). */
 bool is_excluded(const char *name);
 
+/* Called to add options from _info, once it's located. */
+void add_info_options(struct ccan_file *info);
+
 /* Are we happy to compile stuff, or just non-intrusive tests? */
 extern bool safe_mode;
 
+/* Did the user want to keep all the results? */
+extern bool keep_results;
+
 /* Where is the ccan dir?  Available after first manifest. */
 extern const char *ccan_dir;