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 09ff6c92a6cae907b341453077ba5eee58a79de8..73f3278ad6f19323db74b28ddfbe3129d51d33f5 100644 (file)
--- 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;