OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gcov: Add open mode parameter to gcov_do_dump() 

gcc/

	* gcov-tool.cc (gcov_do_dump): Add mode parameter.
	(gcov_output_files): Open files for reading and writing.

libgcc/

	* libgcov-driver-system.c (gcov_exit_open_gcda_file): Add mode
	parameter.  Pass mode to gcov_open() calls.
	* libgcov-driver.c (dump_one_gcov):  Add mode parameter.  Pass mode to
	gcov_exit_open_gcda_file() call.
	(gcov_do_dump): Add mode parameter.  Pass mode to dump_one_gcov()
	calls.
	(__gcov_dump_one):  Open file for reading and writing.
This commit is contained in:
Sebastian Huber 2022-03-31 11:37:56 +02:00
parent d170ecc9fc
commit 1a6314b040
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/gcov-tool.cc
View File

@ -46,7 +46,7 @@ extern int gcov_profile_overlap (struct gcov_info*, struct gcov_info*);
extern int gcov_profile_normalize (struct gcov_info*, gcov_type);
extern int gcov_profile_scale (struct gcov_info*, float, int, int);
extern struct gcov_info* gcov_read_profile_dir (const char*, int);
extern void gcov_do_dump (struct gcov_info *, int);
extern void gcov_do_dump (struct gcov_info *, int, int);
extern const char *gcov_get_filename (struct gcov_info *list);
extern void gcov_set_verbose (void);
@ -124,7 +124,7 @@ gcov_output_files (const char *out, struct gcov_info *profile)
fatal_error (input_location, "output file %s already exists in folder %s",
filename, out);
gcov_do_dump (profile, 0);
gcov_do_dump (profile, 0, 0);
ret = chdir (pwd);
if (ret)

7
libgcc/libgcov-driver-system.c
View File

@ -261,7 +261,8 @@ allocate_filename_struct (struct gcov_filename *gf)
static int
gcov_exit_open_gcda_file (struct gcov_info *gi_ptr,
struct gcov_filename *gf)
struct gcov_filename *gf,
int mode)
{
int append_slash = 0;
const char *fname = gi_ptr->filename;
@ -309,7 +310,7 @@ gcov_exit_open_gcda_file (struct gcov_info *gi_ptr,
gf->filename = replace_filename_variables (gf->filename);
if (!gcov_open (gf->filename, 0))
if (!gcov_open (gf->filename, mode))
{
/* Open failed likely due to missed directory.
Create directory and retry to open file. */
@ -318,7 +319,7 @@ gcov_exit_open_gcda_file (struct gcov_info *gi_ptr,
fprintf (stderr, "profiling:%s:Skip\n", gf->filename);
return -1;
}
if (!gcov_open (gf->filename, 0))
if (!gcov_open (gf->filename, mode))
{
fprintf (stderr, "profiling:%s:Cannot open\n", gf->filename);
return -1;

12
libgcc/libgcov-driver.c
View File

@ -595,14 +595,14 @@ write_one_data (const struct gcov_info *gi_ptr,
static void
dump_one_gcov (struct gcov_info *gi_ptr, struct gcov_filename *gf,
unsigned run_counted ATTRIBUTE_UNUSED,
gcov_type run_max ATTRIBUTE_UNUSED)
gcov_type run_max ATTRIBUTE_UNUSED, int mode)
{
struct gcov_summary summary = {};
int error;
gcov_unsigned_t tag;
fn_buffer = 0;
error = gcov_exit_open_gcda_file (gi_ptr, gf);
error = gcov_exit_open_gcda_file (gi_ptr, gf, mode);
if (error == -1)
return;
@ -649,13 +649,13 @@ read_fatal:;
/* Dump all the coverage counts for the program. It first computes program
summary and then traverses gcov_list list and dumps the gcov_info
objects one by one. */
objects one by one. Use MODE to open files. */
#if !IN_GCOV_TOOL
static
#endif
void
gcov_do_dump (struct gcov_info *list, int run_counted)
gcov_do_dump (struct gcov_info *list, int run_counted, int mode)
{
struct gcov_info *gi_ptr;
struct gcov_filename gf;
@ -678,7 +678,7 @@ gcov_do_dump (struct gcov_info *list, int run_counted)
/* Now merge each file. */
for (gi_ptr = list; gi_ptr; gi_ptr = gi_ptr->next)
{
dump_one_gcov (gi_ptr, &gf, run_counted, run_max);
dump_one_gcov (gi_ptr, &gf, run_counted, run_max, mode);
free (gf.filename);
}
@ -701,7 +701,7 @@ __gcov_dump_one (struct gcov_root *root)
if (root->dumped)
return;
gcov_do_dump (root->list, root->run_counted);
gcov_do_dump (root->list, root->run_counted, 0);
root->dumped = 1;
root->run_counted = 1;