| Message ID | e81b093e-7d5c-b1c4-5991-dc1443ec5ef6@suse.cz |
|---|---|
| State | New |
| Headers | show |
| Series | Add version to intermediate gcov file (PR gcov-profile/83669). | expand |
On 01/03/2018 08:25 AM, Martin Liška wrote: > This is small enhancement reported by users of gcov tool. I'm aware of current stage of GCC, > but it's really small change in code. Apart from that, a small fix to documentation is included. yeah, this is useful, thanks. nathan
Hey Martin, thanks for implementing this! One quick note, given that the intermediate file contains multiple "file" sections, maybe it would make more sense to put the "version:" at the very beginning of the file (maybe outputting it from https://github.com/gcc-mirror/gcc/blob/7ea14e0563d164603686df7e05bbbd20810b7f80/gcc/gcov.c#L1294) and not repeat it before each "file:" section. - Marco. Il 03/01/2018 14:25, Martin Liška ha scritto: > Hi. > > This is small enhancement reported by users of gcov tool. I'm aware of current stage of GCC, > but it's really small change in code. Apart from that, a small fix to documentation is included. > > Survives gcov.exp, may I install it? > Thanks, > Martin > > gcc/ChangeLog: > > 2018-01-03 Martin Liska <mliska@suse.cz> > > PR gcov-profile/83669 > * gcov.c (output_intermediate_file): Add version to intermediate > gcov file. > * doc/gcov.texi: Document new field 'version' in intermediate > file format. Fix location of '-k' option of gcov command. > --- > gcc/doc/gcov.texi | 10 ++++++---- > gcc/gcov.c | 1 + > 2 files changed, 7 insertions(+), 4 deletions(-) > >
diff --git a/gcc/doc/gcov.texi b/gcc/doc/gcov.texi index 8bf422e58d8..be7364d9da9 100644 --- a/gcc/doc/gcov.texi +++ b/gcc/doc/gcov.texi @@ -187,11 +187,8 @@ be used by @command{lcov} or other tools. The output is a single The format of the intermediate @file{.gcov} file is plain text with one entry per line -@item -j -@itemx --human-readable -Write counts in human readable format (like 24k). - @smallexample +version:@var{gcc_version} file:@var{source_file_name} function:@var{start_line_number},@var{end_line_number},@var{execution_count},@var{function_name} lcount:@var{line number},@var{execution_count},@var{has_unexecuted_block} @@ -212,6 +209,7 @@ times. Here is a sample when @option{-i} is used in conjunction with @option{-b} option: @smallexample +version: 8.1.0 20180103 file:tmp.cpp function:7,7,0,_ZN3FooIcEC2Ev function:7,7,1,_ZN3FooIiEC2Ev @@ -252,6 +250,10 @@ branch:35,nottaken lcount:36,1,0 @end smallexample +@item -j +@itemx --human-readable +Write counts in human readable format (like 24k). + @item -k @itemx --use-colors diff --git a/gcc/gcov.c b/gcc/gcov.c index 24e6da09fcf..3c7881b13fa 100644 --- a/gcc/gcov.c +++ b/gcc/gcov.c @@ -1035,6 +1035,7 @@ file 'foo.cc.gcov' similar to the above example. */ static void output_intermediate_file (FILE *gcov_file, source_info *src) { + fprintf (gcov_file, "version:%s\n", version_string); fprintf (gcov_file, "file:%s\n", src->name); /* source file name */ std::sort (src->functions.begin (), src->functions.end (),