|
From: <sv...@va...> - 2011-03-12 12:34:53
|
Author: bart
Date: 2011-03-12 12:34:44 +0000 (Sat, 12 Mar 2011)
New Revision: 11631
Log:
DRD: More source code cleanup (constant propagation).
Modified:
trunk/drd/drd_main.c
trunk/drd/drd_thread.c
trunk/drd/drd_thread.h
Modified: trunk/drd/drd_main.c
===================================================================
--- trunk/drd/drd_main.c 2011-03-12 11:01:06 UTC (rev 11630)
+++ trunk/drd/drd_main.c 2011-03-12 12:34:44 UTC (rev 11631)
@@ -343,7 +343,7 @@
if (!is_stack_mem || DRD_(get_check_stack_accesses)())
{
- DRD_(thread_stop_using_mem)(a1, a2, False);
+ DRD_(thread_stop_using_mem)(a1, a2);
DRD_(clientobj_stop_using_mem)(a1, a2);
DRD_(suppression_stop_using_mem)(a1, a2);
}
Modified: trunk/drd/drd_thread.c
===================================================================
--- trunk/drd/drd_thread.c 2011-03-12 11:01:06 UTC (rev 11630)
+++ trunk/drd/drd_thread.c 2011-03-12 12:34:44 UTC (rev 11631)
@@ -1150,8 +1150,7 @@
* [ a1, a2 [, e.g. because of a call to free() or a stack pointer
* increase.
*/
-void DRD_(thread_stop_using_mem)(const Addr a1, const Addr a2,
- const Bool dont_clear_access)
+void DRD_(thread_stop_using_mem)(const Addr a1, const Addr a2)
{
DrdThreadId other_user;
unsigned i;
@@ -1161,22 +1160,12 @@
for (i = 0; i < DRD_N_THREADS; i++)
{
Segment* p;
- for (p = DRD_(g_threadinfo)[i].first; p; p = p->next)
- {
+ for (p = DRD_(g_threadinfo)[i].first; p; p = p->next) {
if (other_user == DRD_INVALID_THREADID
- && i != DRD_(g_drd_running_tid))
- {
- if (UNLIKELY((!dont_clear_access
- && DRD_(bm_test_and_clear)(DRD_(sg_bm)(p), a1, a2))
- || (dont_clear_access
- && DRD_(bm_has_any_access)(DRD_(sg_bm)(p), a1, a2))
- ))
- {
+ && i != DRD_(g_drd_running_tid)) {
+ if (UNLIKELY(DRD_(bm_test_and_clear)(DRD_(sg_bm)(p), a1, a2)))
other_user = i;
- }
- continue;
- }
- if (!dont_clear_access)
+ } else
DRD_(bm_clear)(DRD_(sg_bm)(p), a1, a2);
}
}
Modified: trunk/drd/drd_thread.h
===================================================================
--- trunk/drd/drd_thread.h 2011-03-12 11:01:06 UTC (rev 11630)
+++ trunk/drd/drd_thread.h 2011-03-12 12:34:44 UTC (rev 11631)
@@ -171,8 +171,7 @@
void DRD_(thread_update_conflict_set)(const DrdThreadId tid,
const VectorClock* const old_vc);
-void DRD_(thread_stop_using_mem)(const Addr a1, const Addr a2,
- const Bool dont_clear_access);
+void DRD_(thread_stop_using_mem)(const Addr a1, const Addr a2);
void DRD_(thread_set_record_loads)(const DrdThreadId tid, const Bool enabled);
void DRD_(thread_set_record_stores)(const DrdThreadId tid, const Bool enabled);
void DRD_(thread_print_all)(void);
|