From ced3c8876d6bd4fbc928c372266940802a1f0561 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 8 Mar 2012 19:02:39 +0000 Subject: [PATCH] Use ANNOTATE_BENIGN_RACE_SIZED() to suppress race reports on owner_lwpid git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12435 --- coregrind/m_scheduler/sema.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/coregrind/m_scheduler/sema.c b/coregrind/m_scheduler/sema.c index 23ad7eec44..b3c85a1854 100644 --- a/coregrind/m_scheduler/sema.c +++ b/coregrind/m_scheduler/sema.c @@ -77,7 +77,8 @@ void ML_(sema_init)(vg_sema_t *sema) buf[1] = 0; sema_char++; INNER_REQUEST(ANNOTATE_RWLOCK_CREATE(sema)); - INNER_REQUEST(ANNOTATE_RWLOCK_CREATE(&sema->owner_lwpid)); + INNER_REQUEST(ANNOTATE_BENIGN_RACE_SIZED(&sema->owner_lwpid, + sizeof(sema->owner_lwpid), "")); res = VG_(write)(sema->pipe[1], buf, 1); vg_assert(res == 1); } @@ -86,7 +87,6 @@ void ML_(sema_deinit)(vg_sema_t *sema) { vg_assert(sema->owner_lwpid != -1); /* must be initialised */ vg_assert(sema->pipe[0] != sema->pipe[1]); - INNER_REQUEST(ANNOTATE_RWLOCK_DESTROY(&sema->owner_lwpid)); INNER_REQUEST(ANNOTATE_RWLOCK_DESTROY(sema)); VG_(close)(sema->pipe[0]); VG_(close)(sema->pipe[1]); @@ -101,9 +101,7 @@ void ML_(sema_down)( vg_sema_t *sema, Bool as_LL ) Int ret; Int lwpid = VG_(gettid)(); - INNER_REQUEST(ANNOTATE_RWLOCK_ACQUIRED(&sema->owner_lwpid, /*is_w*/0)); vg_assert(sema->owner_lwpid != lwpid); /* can't have it already */ - INNER_REQUEST(ANNOTATE_RWLOCK_RELEASED(&sema->owner_lwpid, /*is_w*/0)); vg_assert(sema->pipe[0] != sema->pipe[1]); again: -- 2.47.2