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

Use __gcov_dump and __gcov_reset in execv and fork context. 

PR gcov-profile/93623
	* libgcov-interface.c (__gcov_fork): Do not flush
	and reset only in child process.
	(__gcov_execl): Dump counters only and reset them
	only if exec* fails.
	(__gcov_execlp): Likewise.
	(__gcov_execle): Likewise.
	(__gcov_execv): Likewise.
	(__gcov_execvp): Likewise.
	(__gcov_execve): Likewise.
This commit is contained in:
Martin Liska 2020-05-05 16:15:46 +02:00
parent d39f7dc8d5
commit c0532db47d
No known key found for this signature in database
GPG Key ID: 4DC182DC0FA73785
2 changed files with 56 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libgcc/ChangeLog
View File

@ -1,3 +1,16 @@
2020-05-05 Martin Liska <mliska@suse.cz>
PR gcov-profile/93623
* libgcov-interface.c (__gcov_fork): Do not flush
and reset only in child process.
(__gcov_execl): Dump counters only and reset them
only if exec* fails.
(__gcov_execlp): Likewise.
(__gcov_execle): Likewise.
(__gcov_execv): Likewise.
(__gcov_execvp): Likewise.
(__gcov_execve): Likewise.
2020-05-05 Martin Liska <mliska@suse.cz>
PR gcov-profile/93623

59
libgcc/libgcov-interface.c
View File

@ -197,17 +197,20 @@ __gcov_dump (void)
#endif /* L_gcov_dump */
#ifdef L_gcov_fork
/* A wrapper for the fork function. Flushes the accumulated profiling data, so
that they are not counted twice. */
/* A wrapper for the fork function. We reset counters in the child
so that they are not counted twice. */
pid_t
__gcov_fork (void)
{
pid_t pid;
__gcov_flush ();
pid = fork ();
if (pid == 0)
__GTHREAD_MUTEX_INIT_FUNCTION (&__gcov_flush_mx);
{
__GTHREAD_MUTEX_INIT_FUNCTION (&__gcov_flush_mx);
/* We do not need locking as we are the only thread in the child. */
__gcov_reset_int ();
}
return pid;
}
#endif
@ -223,7 +226,8 @@ __gcov_execl (const char *path, char *arg, ...)
unsigned i, length;
char **args;
__gcov_flush ();
/* Dump counters only, they will be lost after exec. */
__gcov_dump ();
va_start (ap, arg);
va_copy (aq, ap);
@ -239,7 +243,10 @@ __gcov_execl (const char *path, char *arg, ...)
args[i] = va_arg (aq, char *);
va_end (aq);
return execv (path, args);
int ret = execv (path, args);
/* We reach this code only when execv fails, reset counter then here. */
__gcov_reset ();
return ret;
}
#endif
@ -254,7 +261,8 @@ __gcov_execlp (const char *path, char *arg, ...)
unsigned i, length;
char **args;
__gcov_flush ();
/* Dump counters only, they will be lost after exec. */
__gcov_dump ();
va_start (ap, arg);
va_copy (aq, ap);
@ -270,7 +278,10 @@ __gcov_execlp (const char *path, char *arg, ...)
args[i] = va_arg (aq, char *);
va_end (aq);
return execvp (path, args);
int ret = execvp (path, args);
/* We reach this code only when execv fails, reset counter then here. */
__gcov_reset ();
return ret;
}
#endif
@ -286,7 +297,8 @@ __gcov_execle (const char *path, char *arg, ...)
char **args;
char **envp;
__gcov_flush ();
/* Dump counters only, they will be lost after exec. */
__gcov_dump ();
va_start (ap, arg);
va_copy (aq, ap);
@ -303,7 +315,10 @@ __gcov_execle (const char *path, char *arg, ...)
envp = va_arg (aq, char **);
va_end (aq);
return execve (path, args, envp);
int ret = execve (path, args, envp);
/* We reach this code only when execv fails, reset counter then here. */
__gcov_reset ();
return ret;
}
#endif
@ -314,8 +329,12 @@ __gcov_execle (const char *path, char *arg, ...)
int
__gcov_execv (const char *path, char *const argv[])
{
__gcov_flush ();
return execv (path, argv);
/* Dump counters only, they will be lost after exec. */
__gcov_dump ();
int ret = execv (path, argv);
/* We reach this code only when execv fails, reset counter then here. */
__gcov_reset ();
return ret;
}
#endif
@ -326,8 +345,12 @@ __gcov_execv (const char *path, char *const argv[])
int
__gcov_execvp (const char *path, char *const argv[])
{
__gcov_flush ();
return execvp (path, argv);
/* Dump counters only, they will be lost after exec. */
__gcov_dump ();
int ret = execvp (path, argv);
/* We reach this code only when execv fails, reset counter then here. */
__gcov_reset ();
return ret;
}
#endif
@ -338,8 +361,12 @@ __gcov_execvp (const char *path, char *const argv[])
int
__gcov_execve (const char *path, char *const argv[], char *const envp[])
{
__gcov_flush ();
return execve (path, argv, envp);
/* Dump counters only, they will be lost after exec. */
__gcov_dump ();
int ret = execve (path, argv, envp);
/* We reach this code only when execv fails, reset counter then here. */
__gcov_reset ();
return ret;
}
#endif
#endif /* inhibit_libc */