From: Bart Van Assche <bvanassche@acm.org>
Date: Mon, 25 Oct 2010 18:18:54 +0000 (+0000)
Subject: DRD: the help text does now indicate that lock contention detection is off by default... 
X-Git-Tag: svn/VALGRIND_3_7_0~723
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b2de385867be12f7707d1bfaa0d1efca6797d55;p=thirdparty%2Fvalgrind.git

DRD: the help text does now indicate that lock contention detection is off by default / changed default value of the exclusive mutex threshold from 1000s to off. See also #255247.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11477
---

diff --git a/drd/drd_main.c b/drd/drd_main.c
index 953120b754..e317857ff3 100644
--- a/drd/drd_main.c
+++ b/drd/drd_main.c
@@ -184,7 +184,8 @@ static void DRD_(print_usage)(void)
 "    --check-stack-var=yes|no  Whether or not to report data races on\n"
 "                              stack variables [no].\n"
 "    --exclusive-threshold=<n> Print an error message if any mutex or\n"
-"        writer lock is held longer than the specified time (in milliseconds).\n"
+"                              writer lock is held longer than the specified\n"
+"                              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"
@@ -201,7 +202,8 @@ static void DRD_(print_usage)(void)
 "    --segment-merging-interval=<n> Perform segment merging every time n new\n"
 "        segments have been created. Default: %d.\n"
 "    --shared-threshold=<n>    Print an error message if a reader lock\n"
-"        is held longer than the specified time (in milliseconds).\n"
+"                              is held longer than the specified time (in\n"
+"                              milliseconds) [off]\n"
 "    --show-confl-seg=yes|no   Show conflicting segments in race reports [yes].\n"
 "    --show-stack-usage=yes|no Print stack usage at thread exit time [no].\n"
 "\n"
diff --git a/drd/drd_mutex.c b/drd/drd_mutex.c
index 87494f84a1..0d6ad7a871 100644
--- a/drd/drd_mutex.c
+++ b/drd/drd_mutex.c
@@ -49,7 +49,7 @@ static void mutex_delete_thread(struct mutex_info* p, const DrdThreadId tid);
 static Bool s_trace_mutex;
 static ULong s_mutex_lock_count;
 static ULong s_mutex_segment_creation_count;
-static UInt s_mutex_lock_threshold_ms = 1000 * 1000;
+static UInt s_mutex_lock_threshold_ms;
 
 
 /* Function definitions. */