/* ??? Should have an option to print the number of basic blocks, and the
percent of them that are covered. */
-/* ??? Does not correctly handle the case where two .bb files refer to
- the same included source file. For example, if one has a short
- file containing only inline functions, which is then included in
- two other files, then there will be two .bb files which refer to
- the include file, but there is no way to get the total execution
- counts for the included file, can only get execution counts for one
- or the other of the including files. this can be fixed by --ratios
- --long-file-names --preserve-paths and perl. */
-
/* Need an option to show individual block counts, and show
probabilities of fall through arcs. */
#include "gcov-io.h"
#include "gcov-io.c"
-/* The bbg file is generated by -ftest-coverage option. The da file is
+/* The gcno file is generated by -ftest-coverage option. The gcda file is
generated by a program compiled with -fprofile-arcs. Their formats
are documented in gcov-io.h. */
/* Name of source file. */
char *name;
unsigned index;
+ time_t file_time;
/* Array of line information. */
line_t *lines;
static function_t *functions;
-/* This points to the head of the sourcefile structure list. */
+/* This points to the head of the sourcefile structure list. New elements
+ are always prepended. */
static source_t *sources;
+/* Next index for a source file. */
+
+static unsigned source_index;
+
/* This holds data summary information. */
static struct gcov_summary object_summary;
static int no_data_file;
+/* If there is several input files, compute and display results after
+ reading all data files. This way if two or more gcda file refer to
+ the same source file (eg inline subprograms in a .h file), the
+ counts are added. */
+
+static int multiple_files = 0;
+
/* Output branch probabilities. */
static int flag_branches = 0;
static void print_usage (int) ATTRIBUTE_NORETURN;
static void print_version (void) ATTRIBUTE_NORETURN;
static void process_file (const char *);
+static void generate_results (const char *);
static void create_file_names (const char *);
static source_t *find_source (const char *);
static int read_graph_file (void);
if (optind == argc)
print_usage (true);
+ if (argc - argno > 1)
+ multiple_files = 1;
+
for (; argno != argc; argno++)
- {
- release_structures ();
+ process_file (argv[argno]);
- process_file (argv[argno]);
- }
+ generate_results (multiple_files ? NULL : argv[argc - 1]);
+
+ release_structures ();
return 0;
}
FILE *file = error_p ? stderr : stdout;
int status = error_p ? FATAL_EXIT_CODE : SUCCESS_EXIT_CODE;
- fnotice (file, "Usage: gcov [OPTION]... SOURCEFILE\n\n");
+ fnotice (file, "Usage: gcov [OPTION]... SOURCEFILE...\n\n");
fnotice (file, "Print code coverage information.\n\n");
fnotice (file, " -h, --help Print this help, then exit\n");
fnotice (file, " -v, --version Print version number, then exit\n");
static void
process_file (const char *file_name)
{
- source_t *src;
function_t *fn;
+ function_t *fn_p;
+ function_t *old_functions;
+
+ /* Save and clear the list of current functions. They will be appended
+ later. */
+ old_functions = functions;
+ functions = NULL;
create_file_names (file_name);
if (read_graph_file ())
if (read_count_file ())
return;
- for (fn = functions; fn; fn = fn->next)
+ for (fn_p = NULL, fn = functions; fn; fn_p = fn, fn = fn->next)
solve_flow_graph (fn);
+
+ if (fn_p)
+ fn_p->next = old_functions;
+}
+
+static void
+generate_results (const char *file_name)
+{
+ source_t *src;
+ function_t *fn;
+
for (src = sources; src; src = src->next)
src->lines = XCNEWVEC (line_t, src->num_lines);
for (fn = functions; fn; fn = fn->next)
function_t *fn;
source_t *src;
- free (bbg_file_name);
- free (da_file_name);
- da_file_name = bbg_file_name = NULL;
- bbg_file_time = 0;
- bbg_stamp = 0;
-
while ((src = sources))
{
sources = src->next;
int length = strlen (file_name);
int base;
+ /* Free previous file names. */
+ if (bbg_file_name)
+ free (bbg_file_name);
+ if (da_file_name)
+ free (da_file_name);
+ da_file_name = bbg_file_name = NULL;
+ bbg_file_time = 0;
+ bbg_stamp = 0;
+
if (object_directory && object_directory[0])
{
struct stat status;
find_source (const char *file_name)
{
source_t *src;
+ struct stat status;
if (!file_name)
file_name = "<unknown>";
for (src = sources; src; src = src->next)
if (!strcmp (file_name, src->name))
- return src;
+ break;
- src = XCNEW (source_t);
- src->name = xstrdup (file_name);
- src->coverage.name = src->name;
- src->index = sources ? sources->index + 1 : 1;
- src->next = sources;
- sources = src;
+ if (!src)
+ {
+ src = XCNEW (source_t);
+ src->name = xstrdup (file_name);
+ src->coverage.name = src->name;
+ src->index = source_index++;
+ src->next = sources;
+ sources = src;
+
+ if (!stat (file_name, &status))
+ src->file_time = status.st_mtime;
+ }
+
+ if (src->file_time > bbg_file_time)
+ {
+ static int info_emitted;
+
+ fnotice (stderr, "%s:source file is newer than graph file '%s'\n",
+ src->name, bbg_file_name);
+ if (!info_emitted)
+ {
+ fnotice (stderr,
+ "(the message is only displayed one per source file)\n");
+ info_emitted = 1;
+ }
+ src->file_time = 0;
+ }
return src;
}
unsigned version;
unsigned current_tag = 0;
struct function_info *fn = NULL;
+ function_t *old_functions_head = functions;
source_t *src = NULL;
unsigned ix;
unsigned tag;
{
function_t *fn, *fn_p, *fn_n;
- for (fn_p = NULL, fn = functions; fn; fn_p = fn, fn = fn_n)
+ for (fn_p = old_functions_head, fn = functions;
+ fn != old_functions_head;
+ fn_p = fn, fn = fn_n)
{
unsigned ix;
unsigned ident = gcov_read_unsigned ();
struct function_info *fn_n = functions;
+ /* Try to find the function in the list.
+ To speed up the search, first start from the last function
+ found. */
for (fn = fn ? fn->next : NULL; ; fn = fn->next)
{
if (fn)
make_gcov_file_name (const char *input_name, const char *src_name)
{
char *cptr;
- char *name = XNEWVEC (char, strlen (src_name) + strlen (input_name) + 10);
+ char *name;
- name[0] = 0;
- if (flag_long_names && strcmp (src_name, input_name))
+ if (flag_long_names && input_name && strcmp (src_name, input_name))
{
+ name = XNEWVEC (char, strlen (src_name) + strlen (input_name) + 10);
+ name[0] = 0;
/* Generate the input filename part. */
cptr = flag_preserve_paths ? NULL : strrchr (input_name, '/');
strcat (name, cptr ? cptr + 1 : input_name);
strcat (name, "##");
}
+ else
+ {
+ name = XNEWVEC (char, strlen (src_name) + 10);
+ name[0] = 0;
+ }
/* Generate the source filename part. */
cptr = flag_preserve_paths ? NULL : strrchr (src_name, '/');
function_t *fn = NULL;
fprintf (gcov_file, "%9s:%5d:Source:%s\n", "-", 0, src->name);
- fprintf (gcov_file, "%9s:%5d:Graph:%s\n", "-", 0, bbg_file_name);
- fprintf (gcov_file, "%9s:%5d:Data:%s\n", "-", 0,
- no_data_file ? "-" : da_file_name);
- fprintf (gcov_file, "%9s:%5d:Runs:%u\n", "-", 0,
- object_summary.ctrs[GCOV_COUNTER_ARCS].runs);
+ if (!multiple_files)
+ {
+ fprintf (gcov_file, "%9s:%5d:Graph:%s\n", "-", 0, bbg_file_name);
+ fprintf (gcov_file, "%9s:%5d:Data:%s\n", "-", 0,
+ no_data_file ? "-" : da_file_name);
+ fprintf (gcov_file, "%9s:%5d:Runs:%u\n", "-", 0,
+ object_summary.ctrs[GCOV_COUNTER_ARCS].runs);
+ }
fprintf (gcov_file, "%9s:%5d:Programs:%u\n", "-", 0, program_count);
source_file = fopen (src->name, "r");
fnotice (stderr, "%s:cannot open source file\n", src->name);
retval = NULL;
}
- else
- {
- struct stat status;
-
- if (!fstat (fileno (source_file), &status)
- && status.st_mtime > bbg_file_time)
- {
- fnotice (stderr, "%s:source file is newer than graph file '%s'\n",
- src->name, bbg_file_name);
- fprintf (gcov_file, "%9s:%5d:Source is newer than graph\n",
- "-", 0);
- }
- }
+ else if (src->file_time == 0)
+ fprintf (gcov_file, "%9s:%5d:Source is newer than graph\n", "-", 0);
if (flag_branches)
fn = src->functions;
projects / gcc.git / commitdiff