X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.h;h=b0acc910e164eef3361f3172b79964afbad01b8f;hb=578da7e7b6265153fa0519035fc52a086a711ac0;hp=6fdc021673f8597d74add9a40c6c91f904d3e060;hpb=64bd9ff9bc3e65bb0e77b982135d6612cda180cd;p=ccan

diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h
index 6fdc0216..b0acc910 100644
--- a/tools/ccanlint/ccanlint.h
+++ b/tools/ccanlint/ccanlint.h
@@ -2,11 +2,14 @@
 #define CCAN_LINT_H
 #include "config.h"
 #include <ccan/list/list.h>
+#include <ccan/dgraph/dgraph.h>
+#include <ccan/autodata/autodata.h>
 #include <stdbool.h>
 #include "../doc_extract.h"
 #include "licenses.h"
 
-#define REGISTER_TEST(name, ...) extern struct ccanlint name
+AUTODATA_TYPE(ccanlint_tests, struct ccanlint);
+#define REGISTER_TEST(test) AUTODATA(ccanlint_tests, &test)
 
 /* 0 == Describe failed tests.
    1 == Describe results for partial failures.
@@ -80,8 +83,6 @@ struct score {
 };
 
 struct ccanlint {
-	struct list_node list;
-
 	/* More concise unique name of test. */
 	const char *key;
 
@@ -94,12 +95,11 @@ struct ccanlint {
 	/* Should we stop immediately if test fails? */
 	bool compulsory;
 
-	/* keep is set if you should keep the results.
-	 * If timeleft is set to 0, means it timed out.
+	/* 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);
@@ -113,16 +113,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. */
@@ -270,6 +266,9 @@ 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;