|
From: <sv...@va...> - 2011-07-03 11:48:34
|
Author: bart
Date: 2011-07-03 12:43:45 +0100 (Sun, 03 Jul 2011)
New Revision: 11851
Log:
drd: Source code cleanup - merge two blocks of tracing code
Modified:
trunk/drd/drd_thread.c
Modified: trunk/drd/drd_thread.c
===================================================================
--- trunk/drd/drd_thread.c 2011-07-03 11:42:03 UTC (rev 11850)
+++ trunk/drd/drd_thread.c 2011-07-03 11:43:45 UTC (rev 11851)
@@ -1515,31 +1515,19 @@
const Bool included_in_new_conflict_set
= ! DRD_(vc_lte)(&q->vc, new_vc)
&& ! DRD_(vc_lte)(new_vc, &q->vc);
- if (included_in_old_conflict_set != included_in_new_conflict_set)
- {
- if (s_trace_conflict_set)
- {
- char* str;
+ if (s_trace_conflict_set) {
+ char* str;
- str = DRD_(vc_aprint)(&q->vc);
- VG_(message)(Vg_DebugMsg,
- "conflict set: [%d] merging segment %s\n", j, str);
- VG_(free)(str);
- }
- DRD_(bm_mark)(DRD_(g_conflict_set), DRD_(sg_bm)(q));
+ str = DRD_(vc_aprint)(&q->vc);
+ VG_(message)(Vg_DebugMsg,
+ "conflict set: [%d] %s segment %s\n", j,
+ included_in_old_conflict_set
+ != included_in_new_conflict_set
+ ? "merging" : "ignoring", str);
+ VG_(free)(str);
}
- else
- {
- if (s_trace_conflict_set)
- {
- char* str;
-
- str = DRD_(vc_aprint)(&q->vc);
- VG_(message)(Vg_DebugMsg,
- "conflict set: [%d] ignoring segment %s\n", j, str);
- VG_(free)(str);
- }
- }
+ if (included_in_old_conflict_set != included_in_new_conflict_set)
+ DRD_(bm_mark)(DRD_(g_conflict_set), DRD_(sg_bm)(q));
}
}
|