X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ffile_analysis.c;h=985f259b24c3ac87821a614f01ce0ec63e9d1a89;hp=f2ee5d74c005467934c3e738a8f453963e3edb64;hb=299dc8f99ca642943db4f0204b5fe31065545d27;hpb=32a31d9e4fb1f312a47ae8c237ac30d6c1567ccd diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c index f2ee5d74..985f259b 100644 --- a/tools/ccanlint/file_analysis.c +++ b/tools/ccanlint/file_analysis.c @@ -2,8 +2,13 @@ #include #include #include +#include +#include +#include #include #include +#include +#include #include "../tools.h" #include #include @@ -14,12 +19,45 @@ #include #include #include +#include + +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 struct manifest *m, const char *dir) +{ + return strcmp(m->dir, dir) == 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) { + f->contents = grab_file(f, f->fullname, &f->contents_size); + if (!f->contents) + err(1, "Reading file %s", f->fullname); + } + return f->contents; +} char **get_ccan_file_lines(struct ccan_file *f) { if (!f->lines) - f->lines = strsplit(f, f->contents, "\n", &f->num_lines); + f->lines = strsplit(f, get_ccan_file_contents(f), "\n"); + /* FIXME: is f->num_lines necessary? */ + f->num_lines = talloc_array_length(f->lines) - 1; return f->lines; } @@ -27,21 +65,26 @@ struct list_head *get_ccan_file_docs(struct ccan_file *f) { if (!f->doc_sections) { get_ccan_file_lines(f); - f->doc_sections = extract_doc_sections(f->lines, f->num_lines); + f->doc_sections = extract_doc_sections(f->lines); } return f->doc_sections; } -struct ccan_file *new_ccan_file(const void *ctx, char *name) +struct ccan_file *new_ccan_file(const void *ctx, const char *dir, char *name) { struct ccan_file *f; + assert(dir[0] == '/'); + f = talloc(ctx, struct ccan_file); f->lines = NULL; f->line_info = NULL; f->doc_sections = NULL; f->compiled = NULL; f->name = talloc_steal(f, name); + f->fullname = talloc_asprintf(f, "%s/%s", dir, f->name); + f->contents = NULL; + f->cov_compiled = NULL; return f; } @@ -66,8 +109,9 @@ static void add_files(struct manifest *m, const char *dir) if (ent->d_name[0] == '.') continue; - f = new_ccan_file(m, talloc_asprintf(m, "%s%s", - dir, ent->d_name)); + f = new_ccan_file(m, m->dir, + talloc_asprintf(m, "%s%s", + dir, ent->d_name)); if (lstat(f->name, &st) != 0) err(1, "lstat %s", f->name); @@ -83,23 +127,15 @@ static void add_files(struct manifest *m, const char *dir) if (streq(f->name, "_info")) { m->info_file = f; - f->contents = grab_file(f, f->name, &f->contents_size); - if (!f->contents) - err(1, "Reading file %s", f->name); continue; } is_c_src = strends(f->name, ".c"); if (!is_c_src && !strends(f->name, ".h")) { - /* We don't pull in contents of non-source files */ dest = &m->other_files; continue; } - f->contents = grab_file(f, f->name, &f->contents_size); - if (!f->contents) - err(1, "Reading file %s", f->name); - if (!strchr(f->name, '/')) { if (is_c_src) dest = &m->c_files; @@ -127,37 +163,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); @@ -167,30 +225,39 @@ struct manifest *get_manifest(const void *ctx, const char *dir) list_head_init(&m->other_test_c_files); list_head_init(&m->other_test_files); list_head_init(&m->other_files); - list_head_init(&m->dep_dirs); - list_head_init(&m->dep_objs); + list_head_init(&m->examples); + list_head_init(&m->mangled_examples); + list_head_init(&m->deps); - olddir = talloc_getcwd(NULL); - if (!olddir) - err(1, "Getting current directory"); - - if (chdir(dir) != 0) - err(1, "Failed to chdir to %s", dir); - - m->basename = talloc_getcwd(m); - if (!m->basename) - err(1, "Getting current directory"); - len = strlen(m->basename); - while (len && m->basename[len-1] == '/') - m->basename[--len] = '\0'; + len = strlen(m->dir); + while (len && m->dir[len-1] == '/') + m->dir[--len] = '\0'; - m->basename = strrchr(m->basename, '/'); + m->basename = strrchr(m->dir, '/'); if (!m->basename) errx(1, "I don't expect to be run from the root directory"); m->basename++; + /* We expect the ccan dir to be two levels above module dir. */ + if (!ccan_dir) { + char *p; + ccan_dir = talloc_strdup(NULL, m->dir); + p = strrchr(ccan_dir, '/'); + *p = '\0'; + p = strrchr(ccan_dir, '/'); + *p = '\0'; + } + 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); @@ -550,3 +617,36 @@ 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 *errorfmt, ...) +{ + va_list ap; + + struct file_error *fe = talloc(score, struct file_error); + fe->file = f; + fe->line = line; + list_add_tail(&score->per_file_errors, &fe->list); + + if (!score->error) + score->error = talloc_strdup(score, ""); + + if (verbose < 2 && strcount(score->error, "\n") > 5) + return; + + if (line) + score->error = talloc_asprintf_append(score->error, + "%s:%u:", + f->fullname, line); + else + score->error = talloc_asprintf_append(score->error, + "%s:", f->fullname); + + va_start(ap, errorfmt); + score->error = talloc_vasprintf_append(score->error, errorfmt, ap); + va_end(ap); + score->error = talloc_append_string(score->error, "\n"); + + if (verbose < 2 && strcount(score->error, "\n") > 5) + score->error = talloc_append_string(score->error, + "... more (use -vv to see them all)\n"); +}