|
From: <sv...@va...> - 2011-07-03 11:45:39
|
Author: bart
Date: 2011-07-03 12:40:49 +0100 (Sun, 03 Jul 2011)
New Revision: 11848
Log:
drd: Source code cleanup - change two variables from int to bool and outdent one code block
Modified:
trunk/drd/drd_thread.c
Modified: trunk/drd/drd_thread.c
===================================================================
--- trunk/drd/drd_thread.c 2011-07-03 11:39:30 UTC (rev 11847)
+++ trunk/drd/drd_thread.c 2011-07-03 11:40:49 UTC (rev 11848)
@@ -1509,10 +1509,10 @@
for (q = DRD_(g_threadinfo)[j].last; q; q = q->prev)
{
- const int included_in_old_conflict_set
+ const Bool included_in_old_conflict_set
= ! DRD_(vc_lte)(&q->vc, old_vc)
&& ! DRD_(vc_lte)(old_vc, &q->vc);
- const int included_in_new_conflict_set
+ 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)
@@ -1546,19 +1546,17 @@
DRD_(bm_clear_marked)(DRD_(g_conflict_set));
p = DRD_(g_threadinfo)[tid].last;
+ for (j = 0; j < DRD_N_THREADS; j++)
{
- for (j = 0; j < DRD_N_THREADS; j++)
+ if (j != tid && DRD_(IsValidDrdThreadId)(j))
{
- if (j != tid && DRD_(IsValidDrdThreadId)(j))
+ Segment* q;
+ for (q = DRD_(g_threadinfo)[j].last; q; q = q->prev)
{
- Segment* q;
- for (q = DRD_(g_threadinfo)[j].last; q; q = q->prev)
+ if (! DRD_(vc_lte)(&q->vc, &p->vc)
+ && ! DRD_(vc_lte)(&p->vc, &q->vc))
{
- if (! DRD_(vc_lte)(&q->vc, &p->vc)
- && ! DRD_(vc_lte)(&p->vc, &q->vc))
- {
- DRD_(bm_merge2_marked)(DRD_(g_conflict_set), DRD_(sg_bm)(q));
- }
+ DRD_(bm_merge2_marked)(DRD_(g_conflict_set), DRD_(sg_bm)(q));
}
}
}
|