drd: Source code refactoring - use DRD_(thread_get_vc)() wherever appropriate
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12350 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/drd/drd_barrier.c b/drd/drd_barrier.c
index 33e32aa..5bab27a 100644
--- a/drd/drd_barrier.c
+++ b/drd/drd_barrier.c
@@ -472,15 +472,14 @@
{
VectorClock old_vc;
- DRD_(vc_copy)(&old_vc, &DRD_(g_threadinfo)[tid].last->vc);
+ DRD_(vc_copy)(&old_vc, DRD_(thread_get_vc)(tid));
VG_(OSetGen_ResetIter)(oset);
for ( ; (r = VG_(OSetGen_Next)(oset)) != 0; )
{
if (r != q)
{
tl_assert(r->sg);
- DRD_(vc_combine)(&DRD_(g_threadinfo)[tid].last->vc,
- &r->sg->vc);
+ DRD_(vc_combine)(DRD_(thread_get_vc)(tid), &r->sg->vc);
}
}
DRD_(thread_update_conflict_set)(tid, &old_vc);
diff --git a/drd/drd_rwlock.c b/drd/drd_rwlock.c
index aaa61e0..fdcbe3d 100644
--- a/drd/drd_rwlock.c
+++ b/drd/drd_rwlock.c
@@ -173,20 +173,14 @@
DRD_(vc_copy)(&old_vc, DRD_(thread_get_vc)(tid));
VG_(OSetGen_ResetIter)(p->thread_info);
- for ( ; (q = VG_(OSetGen_Next)(p->thread_info)) != 0; )
- {
- if (q->tid != tid)
- {
+ for ( ; (q = VG_(OSetGen_Next)(p->thread_info)) != 0; ) {
+ if (q->tid != tid) {
if (q->latest_wrlocked_segment)
- {
DRD_(vc_combine)(DRD_(thread_get_vc)(tid),
&q->latest_wrlocked_segment->vc);
- }
if (readers_too && q->latest_rdlocked_segment)
- {
DRD_(vc_combine)(DRD_(thread_get_vc)(tid),
&q->latest_rdlocked_segment->vc);
- }
}
}
DRD_(thread_update_conflict_set)(tid, &old_vc);
diff --git a/drd/drd_thread.c b/drd/drd_thread.c
index c28bcff..9f0bbcb 100644
--- a/drd/drd_thread.c
+++ b/drd/drd_thread.c
@@ -1082,8 +1082,7 @@
VG_(free)(str1);
VG_(free)(str2);
}
- if (joiner == DRD_(g_drd_running_tid))
- {
+ if (joiner == DRD_(g_drd_running_tid)) {
VectorClock old_vc;
DRD_(vc_copy)(&old_vc, DRD_(thread_get_vc)(joiner));
@@ -1092,18 +1091,16 @@
DRD_(thread_update_conflict_set)(joiner, &old_vc);
s_update_conflict_set_join_count++;
DRD_(vc_cleanup)(&old_vc);
- }
- else
- {
+ } else {
DRD_(vc_combine)(DRD_(thread_get_vc)(joiner),
DRD_(thread_get_vc)(joinee));
}
thread_discard_ordered_segments();
- if (DRD_(sg_get_trace)())
- {
+ if (DRD_(sg_get_trace)()) {
char* str;
+
str = DRD_(vc_aprint)(DRD_(thread_get_vc)(joiner));
VG_(message)(Vg_DebugMsg, "After join: %s\n", str);
VG_(free)(str);
@@ -1124,14 +1121,12 @@
tl_assert(sg);
tl_assert(vc);
- if (tid != sg->tid)
- {
+ if (tid != sg->tid) {
VectorClock old_vc;
DRD_(vc_copy)(&old_vc, DRD_(thread_get_vc)(tid));
DRD_(vc_combine)(DRD_(thread_get_vc)(tid), vc);
- if (DRD_(sg_get_trace)())
- {
+ if (DRD_(sg_get_trace)()) {
char *str1, *str2;
str1 = DRD_(vc_aprint)(&old_vc);
str2 = DRD_(vc_aprint)(DRD_(thread_get_vc)(tid));
@@ -1146,9 +1141,7 @@
s_update_conflict_set_sync_count++;
DRD_(vc_cleanup)(&old_vc);
- }
- else
- {
+ } else {
tl_assert(DRD_(vc_lte)(vc, DRD_(thread_get_vc)(tid)));
}
}
@@ -1393,18 +1386,14 @@
s_conflict_set_bitmap2_creation_count
-= DRD_(bm_get_bitmap2_creation_count)();
- if (*conflict_set)
- {
+ if (*conflict_set) {
DRD_(bm_cleanup)(*conflict_set);
DRD_(bm_init)(*conflict_set);
- }
- else
- {
+ } else {
*conflict_set = DRD_(bm_new)();
}
- if (s_trace_conflict_set)
- {
+ if (s_trace_conflict_set) {
char* str;
str = DRD_(vc_aprint)(DRD_(thread_get_vc)(tid));
@@ -1499,8 +1488,7 @@
tl_assert(tid == DRD_(g_drd_running_tid));
tl_assert(DRD_(g_conflict_set));
- if (s_trace_conflict_set)
- {
+ if (s_trace_conflict_set) {
char* str;
str = DRD_(vc_aprint)(DRD_(thread_get_vc)(tid));