Data races on *stdout / *stderr are now suppressed via these objects itselves instead...

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7848

diff --git a/exp-drd/drd_pthread_intercepts.c b/exp-drd/drd_pthread_intercepts.c
index 36793c68120515374fd04345c13e0041acc02704..6e1e6d8dfa94bba45a88f6a4542e9b23ca993567 100644 (file)
--- a/exp-drd/drd_pthread_intercepts.c
+++ b/exp-drd/drd_pthread_intercepts.c
@@ -98,6 +98,11 @@ void _init(void)
 {
   check_threading_library();
   vg_set_main_thread_state();
+  /* glibc up to and including version 2.7 triggers conflicting accesses   */
+  /* on stdout and stderr when sending output to one of these streams from */
+  /* more than one thread. Suppress data race reports on these objects.    */
+  DRD_IGNORE_VAR(*stdout);
+  DRD_IGNORE_VAR(*stderr);
 }
 
 static MutexT pthread_to_drd_mutex_type(const int kind)

diff --git a/glibc-2.X-drd.supp b/glibc-2.X-drd.supp
index 9253186fd39149e63200f97e43a08ce9f040e125..26e173528653da9114fe167c1fd95691b3712228 100644 (file)
--- a/glibc-2.X-drd.supp
+++ b/glibc-2.X-drd.supp
@@ -75,29 +75,6 @@
    fun:__libc_disable_asynccancel
    obj:/lib*/libc-*
 }
-{
-   libc-race-in-vfprintf
-   exp-drd:ConflictingAccess
-   fun:vfprintf
-}
-{
-   libc-race-in-vsnprintf
-   exp-drd:ConflictingAccess
-   fun:vsnprintf
-}
-{
-   libc-race-in-vsnprintf
-   exp-drd:ConflictingAccess
-   obj:/lib*/libc-*
-   fun:vsnprintf
-}
-{
-   libc-race-in-vsnprintf
-   exp-drd:ConflictingAccess
-   obj:/lib*/libc-*
-   obj:/lib*/libc-*
-   fun:vsnprintf
-}
 {
    librt
    exp-drd:ConflictingAccess