ccanlint: use ccan/autodata

[ccan] / tools / ccanlint / ccanlint.h

diff --git a/tools/ccanlint/ccanlint.h b/tools/ccanlint/ccanlint.h
index 827fba141ff1c3908a790df7f793cc5f1ae43755..b0acc910e164eef3361f3172b79964afbad01b8f 100644 (file)
--- 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.
@@ -20,6 +23,7 @@ extern int verbose;
 enum compile_type {
        COMPILE_NORMAL,
        COMPILE_NOFEAT,
+       COMPILE_COVERAGE,
        COMPILE_TYPES
 };
 
@@ -79,8 +83,6 @@ struct score {
 };
 
 struct ccanlint {
-       struct list_node list;
-
        /* More concise unique name of test. */
        const char *key;
 
@@ -90,12 +92,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);
@@ -109,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. */
@@ -182,9 +182,6 @@ struct ccan_file {
        /* If this file gets compiled (eg. .C file to .o file), result here. */
        char *compiled[COMPILE_TYPES];
 
-       /* Compiled with coverage information. */
-       char *cov_compiled;
-
        /* Filename containing output from valgrind. */
        char *valgrind_log;
 
@@ -237,6 +234,20 @@ char **per_file_options(const struct ccanlint *test, struct ccan_file *f);
 void score_file_error(struct score *, struct ccan_file *f, unsigned line,
                      const char *errorfmt, ...);
 
+/* Start a command in the background. */
+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);
+
 /* Normal tests. */
 extern struct ccanlint trailing_whitespace;
 
@@ -249,9 +260,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;