X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ffile_analysis.c;h=7b2565a983377826fe1f8a9195744b83bbb713cb;hp=9abd62288e6923307f68716d34ea7d7b2a96da04;hb=a1585d5b6833783d104acecadce4574115f97cea;hpb=f3305bc06847d022831f8ffd7beaccab316d8143

diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c
index 9abd6228..7b2565a9 100644
--- a/tools/ccanlint/file_analysis.c
+++ b/tools/ccanlint/file_analysis.c
@@ -2,8 +2,13 @@
 #include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
 #include <ccan/str_talloc/str_talloc.h>
+#include <ccan/talloc_link/talloc_link.h>
+#include <ccan/hash/hash.h>
+#include <ccan/htable/htable_type.h>
 #include <ccan/grab_file/grab_file.h>
 #include <ccan/noerr/noerr.h>
+#include <ccan/foreach/foreach.h>
+#include <ccan/asort/asort.h>
 #include "../tools.h"
 #include <unistd.h>
 #include <sys/types.h>
@@ -18,6 +23,24 @@
 
 const char *ccan_dir;
 
+static size_t dir_hash(const char *name)
+{
+	return hash(name, strlen(name), 0);
+}
+
+static const char *manifest_name(const struct manifest *m)
+{
+	return m->dir;
+}
+
+static bool dir_cmp(const char *dir1, const char *dir2)
+{
+	return strcmp(dir1, dir2) == 0;
+}
+
+HTABLE_DEFINE_TYPE(struct manifest, manifest_name, dir_hash, dir_cmp, manifest);
+static struct htable_manifest *manifests;
+
 const char *get_ccan_file_contents(struct ccan_file *f)
 {
 	if (!f->contents) {
@@ -139,37 +162,59 @@ static void add_files(struct manifest *m, const char *dir)
 	closedir(d);
 }
 
-char *report_on_lines(struct list_head *files,
-		      char *(*report)(const char *),
-		      char *sofar)
+static int cmp_names(struct ccan_file *const *a, struct ccan_file *const *b,
+		     void *unused)
 {
-	struct ccan_file *f;
-
-	list_for_each(files, f, list) {
-		unsigned int i;
-		char **lines = get_ccan_file_lines(f);
-
-		for (i = 0; i < f->num_lines; i++) {
-			char *r = report(lines[i]);
-			if (!r)
-				continue;
+	return strcmp((*a)->name, (*b)->name);
+}
 
-			sofar = talloc_asprintf_append(sofar,
-						       "%s:%u:%s\n",
-						       f->name, i+1, r);
-			talloc_free(r);
-		}
+static void sort_files(struct list_head *list)
+{
+	struct ccan_file **files = NULL, *f;
+	unsigned int i, num;
+
+	num = 0;
+	while ((f = list_top(list, struct ccan_file, list)) != NULL) {
+		files = talloc_realloc(NULL, files, struct ccan_file *, num+1);
+		files[num++] = f;
+		list_del(&f->list);
 	}
-	return sofar;
+	asort(files, num, cmp_names, NULL);
+
+	for (i = 0; i < num; i++)
+		list_add_tail(list, &files[i]->list);
+	talloc_free(files);
 }
 
 struct manifest *get_manifest(const void *ctx, const char *dir)
 {
-	struct manifest *m = talloc(ctx, struct manifest);
-	char *olddir;
+	struct manifest *m;
+	char *olddir, *canon_dir;
 	unsigned int len;
+	struct list_head *list;
+
+	if (!manifests)
+		manifests = htable_manifest_new();
 
+	olddir = talloc_getcwd(NULL);
+	if (!olddir)
+		err(1, "Getting current directory");
+
+	if (chdir(dir) != 0)
+		err(1, "Failed to chdir to %s", dir);
+
+	canon_dir = talloc_getcwd(olddir);
+	if (!canon_dir)
+		err(1, "Getting current directory");
+
+	m = htable_manifest_get(manifests, canon_dir);
+	if (m)
+		goto done;
+
+	m = talloc_linked(ctx, talloc(NULL, struct manifest));
 	m->info_file = NULL;
+	m->compiled = NULL;
+	m->dir = talloc_steal(m, canon_dir);
 	list_head_init(&m->c_files);
 	list_head_init(&m->h_files);
 	list_head_init(&m->api_tests);
@@ -180,18 +225,8 @@ struct manifest *get_manifest(const void *ctx, const char *dir)
 	list_head_init(&m->other_test_files);
 	list_head_init(&m->other_files);
 	list_head_init(&m->examples);
-	list_head_init(&m->dep_dirs);
-
-	olddir = talloc_getcwd(NULL);
-	if (!olddir)
-		err(1, "Getting current directory");
-
-	if (chdir(dir) != 0)
-		err(1, "Failed to chdir to %s", dir);
-
-	m->dir = talloc_getcwd(m);
-	if (!m->dir)
-		err(1, "Getting current directory");
+	list_head_init(&m->mangled_examples);
+	list_head_init(&m->deps);
 
 	len = strlen(m->dir);
 	while (len && m->dir[len-1] == '/')
@@ -214,6 +249,14 @@ struct manifest *get_manifest(const void *ctx, const char *dir)
 
 	add_files(m, "");
 
+	/* Nicer to run tests in a predictable order. */
+	foreach_ptr(list, &m->api_tests, &m->run_tests, &m->compile_ok_tests,
+		    &m->compile_fail_tests)
+		sort_files(list);
+
+	htable_manifest_add(manifests, m);
+
+done:
 	if (chdir(olddir) != 0)
 		err(1, "Returning to original directory '%s'", olddir);
 	talloc_free(olddir);
@@ -573,3 +616,12 @@ enum line_compiled get_ccan_line_pp(struct pp_conditions *cond,
 	return ret;
 }
 
+void score_file_error(struct score *score, struct ccan_file *f, unsigned line,
+		      const char *error)
+{
+	struct file_error *fe = talloc(score, struct file_error);
+	fe->file = f;
+	fe->line = line;
+	fe->error = error;
+	list_add_tail(&score->per_file_errors, &fe->list);
+}