From: Julian Seward <jseward@acm.org>
Date: Thu, 20 Nov 2008 11:20:50 +0000 (+0000)
Subject: Re-set constraints in 'consistent' style after a race is detected,
X-Git-Tag: svn/VALGRIND_3_4_0~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36ca6df95adbe9531460c733541a66b4dc3f6cb0;p=thirdparty%2Fvalgrind.git

Re-set constraints in 'consistent' style after a race is detected,
instead of the more aggressive setting, which appeared to cause a
large number of extra race reports.



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

diff --git a/helgrind/libhb_core.c b/helgrind/libhb_core.c
index 09ff6c92a6..73f3278ad6 100644
--- a/helgrind/libhb_core.c
+++ b/helgrind/libhb_core.c
@@ -3288,8 +3288,15 @@ static inline SVal msm_read ( SVal svOld,
          tl_assert(ordxx == POrd_EQ || ordxx == POrd_LT);
          svNew = MSM_RACE2ERR
                     ? SVal__mkE()
+#if 0
+           //std
                     : SVal__mkC( VtsID__join2(wmini,tviR),
                                  VtsID__join2(wmini,tviW) );
+#else
+         // relaxed
+                    : SVal__mkC( VtsID__join2(rmini,tviR),
+                                 VtsID__join2(wmini,tviW) );
+#endif
          record_race_info( acc_thr, acc_addr, szB, False/*!isWrite*/,
                            svOld, svNew );
          goto out;
@@ -3358,8 +3365,15 @@ static inline SVal msm_write ( SVal svOld,
          tl_assert(ordxx == POrd_EQ || ordxx == POrd_LT);
          svNew = MSM_RACE2ERR
                     ? SVal__mkE()
+#if 0
+           // std
                     : SVal__mkC( VtsID__join2(wmini,tviR),
                                  VtsID__join2(wmini,tviW) );
+#else
+         // relaxed
+                    : SVal__mkC( VtsID__join2(rmini,tviR),
+                                 VtsID__join2(wmini,tviW) );
+#endif
          record_race_info( acc_thr, acc_addr, szB, True/*isWrite*/,
                            svOld, svNew );
          goto out;