DRD: Restored --free-is-write support and fixed the bug that was present in the previous implementation. Still needs further testing though.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11636 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/drd/drd_main.c b/drd/drd_main.c
index 51fd337..da02133 100644
--- a/drd/drd_main.c
+++ b/drd/drd_main.c
@@ -57,6 +57,7 @@
/* Local variables. */
+static Bool s_free_is_write = False;
static Bool s_print_stats = False;
static Bool s_var_info = False;
static Bool s_show_stack_usage = False;
@@ -94,6 +95,7 @@
if VG_BOOL_CLO(arg, "--check-stack-var", check_stack_accesses) {}
else if VG_BOOL_CLO(arg, "--drd-stats", s_print_stats) {}
else if VG_BOOL_CLO(arg, "--first-race-only", first_race_only) {}
+ else if VG_BOOL_CLO(arg, "--free-is-write", s_free_is_write) {}
else if VG_BOOL_CLO(arg,"--report-signal-unlocked",report_signal_unlocked)
{}
else if VG_BOOL_CLO(arg, "--segment-merging", segment_merging) {}
@@ -192,6 +194,8 @@
" time (in milliseconds) [off].\n"
" --first-race-only=yes|no Only report the first data race that occurs on\n"
" a memory location instead of all races [no].\n"
+" --free-is-write=yes|no Whether to report races between freeing memory\n"
+" and subsequent accesses of that memory[no].\n"
" --report-signal-unlocked=yes|no Whether to report calls to\n"
" pthread_cond_signal() where the mutex associated\n"
" with the signal via pthread_cond_wait() is not\n"
@@ -299,13 +303,18 @@
void drd_start_using_mem(const Addr a1, const SizeT len,
const Bool is_stack_mem)
{
- tl_assert(a1 <= a1 + len);
+ const Addr a2 = a1 + len;
+
+ tl_assert(a1 <= a2);
if (!is_stack_mem && s_trace_alloc)
VG_(message)(Vg_UserMsg, "Started using memory range 0x%lx + %ld%s\n",
a1, len, DRD_(running_thread_inside_pthread_create)()
? " (inside pthread_create())" : "");
+ if (!is_stack_mem && s_free_is_write)
+ DRD_(thread_stop_using_mem)(a1, a2);
+
if (UNLIKELY(DRD_(any_address_is_traced)()))
{
DRD_(trace_mem_access)(a1, len, eStart);
@@ -313,7 +322,7 @@
if (UNLIKELY(DRD_(running_thread_inside_pthread_create)()))
{
- DRD_(start_suppression)(a1, a1 + len, "pthread_create()");
+ DRD_(start_suppression)(a1, a2, "pthread_create()");
}
}
@@ -348,7 +357,10 @@
if (!is_stack_mem || DRD_(get_check_stack_accesses)())
{
- DRD_(thread_stop_using_mem)(a1, a2);
+ if (is_stack_mem || !s_free_is_write)
+ DRD_(thread_stop_using_mem)(a1, a2);
+ else if (s_free_is_write)
+ DRD_(trace_store)(a1, len);
DRD_(clientobj_stop_using_mem)(a1, a2);
DRD_(suppression_stop_using_mem)(a1, a2);
}