Use -O not -O3: reduces ccan/tdb test time from 24 to 18 seconds.

[ccan] / tools / depends.c

diff --git a/tools/depends.c b/tools/depends.c
index c631b9bc82968747147a1fd7328297a5d9fff3bc..203788fe9bed29dff55021eb6cf23bef442bfa54 100644 (file)
--- a/tools/depends.c
+++ b/tools/depends.c
@@ -1,11 +1,12 @@
-#include "talloc/talloc.h"
-#include "str/str.h"
-#include "grab_file/grab_file.h"
-#include "str_talloc/str_talloc.h"
+#include <ccan/talloc/talloc.h>
+#include <ccan/str/str.h>
+#include <ccan/grab_file/grab_file.h>
+#include <ccan/str_talloc/str_talloc.h>
 #include "tools.h"
 #include <err.h>
 #include <stdbool.h>
 #include <unistd.h>
+#include <errno.h>
 
 static char ** __attribute__((format(printf, 3, 4)))
 lines_from_cmd(const void *ctx, unsigned int *num, char *format, ...)
@@ -37,11 +38,12 @@ static int unlink_info(char *infofile)
 }
 
 /* Be careful about trying to compile over running programs (parallel make) */
-static char *compile_info(const void *ctx, const char *dir)
+static char *compile_info(const void *ctx, const char *dir, const char *name)
 {
-       char *infofile = talloc_asprintf(ctx, "%s/_info.%u", dir, getpid());
-       char *cmd = talloc_asprintf(ctx, "cc " CFLAGS " -o %s %s/_info.c",
-                                   infofile, dir);
+       char *infofile = talloc_asprintf(ctx, "%s/info.%u", dir, getpid());
+       char *cmd = talloc_asprintf(ctx, "cc " CFLAGS
+                                   " -o %s -x c %s/%s/_info",
+                                   infofile, dir, name);
        talloc_set_destructor(infofile, unlink_info);
        if (system(cmd) != 0)
                return NULL;
@@ -49,13 +51,14 @@ static char *compile_info(const void *ctx, const char *dir)
        return infofile;
 }
 
-static char **get_one_deps(const void *ctx, const char *dir, unsigned int *num)
+static char **get_one_deps(const void *ctx, const char *dir,
+                          const char *name, unsigned int *num)
 {
        char **deps, *cmd, *infofile;
 
-       infofile = compile_info(ctx, dir);
+       infofile = compile_info(ctx, dir, name);
        if (!infofile)
-               errx(1, "Could not compile _info for '%s'", dir);
+               errx(1, "Could not compile _info for '%s'", name);
 
        cmd = talloc_asprintf(ctx, "%s depends", infofile);
        deps = lines_from_cmd(cmd, num, "%s", cmd);
@@ -93,12 +96,13 @@ static char *replace(const void *ctx, const char *src,
 
 /* This is a terrible hack.  We scan for ccan/ strings. */
 static char **get_one_safe_deps(const void *ctx,
-                               const char *dir, unsigned int *num)
+                               const char *dir, const char *name,
+                               unsigned int *num)
 {
        char **deps, **lines, *raw, *fname;
        unsigned int i, n = 0;
 
-       fname = talloc_asprintf(ctx, "%s/_info.c", dir);
+       fname = talloc_asprintf(ctx, "%s/%s/_info", dir, name);
        raw = grab_file(fname, fname, NULL);
        if (!raw)
                errx(1, "Could not open %s", fname);
@@ -112,6 +116,10 @@ static char **get_one_safe_deps(const void *ctx,
                char *str;
                unsigned int len;
 
+               /* Ignore lines starting with # (e.g. #include) */
+               if (lines[i][0] == '#')
+                       continue;
+
                /* Start of line, or after ". */
                if (strstarts(lines[i], "ccan/"))
                        str = lines[i];
@@ -146,13 +154,14 @@ static bool have_dep(char **deps, unsigned int num, const char *dep)
 
 /* Gets all the dependencies, recursively. */
 static char **
-get_all_deps(const void *ctx, const char *dir,
-            char **(*get_one)(const void *, const char *, unsigned int *))
+get_all_deps(const void *ctx, const char *dir, const char *name,
+            char **(*get_one)(const void *, const char *, const char *,
+                              unsigned int *))
 {
        char **deps;
        unsigned int i, num;
 
-       deps = get_one(ctx, dir, &num);
+       deps = get_one(ctx, dir, name, &num);
        for (i = 0; i < num; i++) {
                char **newdeps;
                unsigned int j, newnum;
@@ -160,7 +169,8 @@ get_all_deps(const void *ctx, const char *dir,
                if (!strstarts(deps[i], "ccan/"))
                        continue;
 
-               newdeps = get_one(ctx, deps[i], &newnum);
+               newdeps = get_one(ctx, dir, deps[i] + strlen("ccan/"),
+                                 &newnum);
 
                /* Should be short, so brute-force out dups. */
                for (j = 0; j < newnum; j++) {
@@ -175,21 +185,38 @@ get_all_deps(const void *ctx, const char *dir,
        return deps;
 }
 
-char **get_deps(const void *ctx, const char *dir, bool recurse)
+char **get_libs(const void *ctx, const char *dir,
+               const char *name, unsigned int *num)
+{
+       char **libs, *cmd, *infofile;
+
+       infofile = compile_info(ctx, dir, name);
+       if (!infofile)
+               errx(1, "Could not compile _info for '%s'", name);
+
+       cmd = talloc_asprintf(ctx, "%s libs", infofile);
+       libs = lines_from_cmd(cmd, num, "%s", cmd);
+       if (!libs)
+               err(1, "Could not run '%s'", cmd);
+       return libs;
+}
+
+char **get_deps(const void *ctx, const char *dir, const char *name,
+               bool recurse)
 {
        if (!recurse) {
                unsigned int num;
-               return get_one_deps(ctx, dir, &num);
+               return get_one_deps(ctx, dir, name, &num);
        }
-       return get_all_deps(ctx, dir, get_one_deps);
+       return get_all_deps(ctx, dir, name, get_one_deps);
 }
 
-char **get_safe_ccan_deps(const void *ctx, const char *dir, bool recurse)
+char **get_safe_ccan_deps(const void *ctx, const char *dir,
+                         const char *name, bool recurse)
 {
        if (!recurse) {
                unsigned int num;
-               return get_one_safe_deps(ctx, dir, &num);
+               return get_one_safe_deps(ctx, dir, name, &num);
        }
-       return get_all_deps(ctx, dir, get_one_safe_deps);
+       return get_all_deps(ctx, dir, name, get_one_safe_deps);
 }
-