Double the maximum size of the conflict cache.

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

diff --git a/helgrind/docs/hg-manual.xml b/helgrind/docs/hg-manual.xml
index d45664bccb3e03c79f15a21a894d2b53b7016ffd..41ba083c3c7498e3434d43c3a9674390cdffa7f5 100644 (file)
--- a/helgrind/docs/hg-manual.xml
+++ b/helgrind/docs/hg-manual.xml
@@ -1005,11 +1005,11 @@ unlock(mx)                             unlock(mx)
         conflicting access information is stored.  If you find that
         Helgrind is showing race errors with only one stack instead of
         the expected two stacks, try increasing this value.</para>
-      <para>The minimum value is 10,000 and the maximum is 10,000,000
-        (ten times the default value).  Increasing the value by 1
+      <para>The minimum value is 10,000 and the maximum is 20,000,000
+        (twenty times the default value).  Increasing the value by 1
         increases Helgrind's memory requirement by very roughly 100
-        bytes, so the maximum value will easily eat up an extra
-        gigabyte or so of memory.</para>
+        bytes, so the maximum value will easily eat up two extra
+        gigabytes or so of memory.</para>
     </listitem>
   </varlistentry>
 

diff --git a/helgrind/hg_main.c b/helgrind/hg_main.c
index ee72e307459f63b87ef2eaf313054be5475423b3..3a53f7129e54db8baa50c1c7079ec662a43d6304 100644 (file)
--- a/helgrind/hg_main.c
+++ b/helgrind/hg_main.c
@@ -4397,10 +4397,10 @@ static Bool hg_process_cmd_line_option ( Char* arg )
    else if VG_XACT_CLO(arg, "--history-level=full",
                             HG_(clo_history_level), 2);
 
-   /* If you change the 10k/10mill limits, remember to also change
+   /* If you change the 10k/20mill limits, remember to also change
       them in assertions at the top of event_map_maybe_GC. */
    else if VG_BINT_CLO(arg, "--conflict-cache-size",
-                       HG_(clo_conflict_cache_size), 10*1000, 10*1000*1000) {}
+                       HG_(clo_conflict_cache_size), 10*1000, 20*1000*1000) {}
 
    /* "stuvwx" --> stuvwx (binary) */
    else if VG_STR_CLO(arg, "--hg-sanity-flags", tmp_str) {

diff --git a/helgrind/libhb_core.c b/helgrind/libhb_core.c
index 3a5f7c60d0653bed478c5aa96a86b54318fd5ec2..7b0e97621ece94c14584b47d8d4e2956c65e077c 100644 (file)
--- a/helgrind/libhb_core.c
+++ b/helgrind/libhb_core.c
@@ -3797,7 +3797,7 @@ static void event_map_maybe_GC ( void )
    /* Check for sane command line params.  Limit values must match
       those in hg_process_cmd_line_option. */
    tl_assert( HG_(clo_conflict_cache_size) >= 10*1000 );
-   tl_assert( HG_(clo_conflict_cache_size) <= 10*1000*1000 );
+   tl_assert( HG_(clo_conflict_cache_size) <= 20*1000*1000 );
 
    /* Check our counting is sane (expensive) */
    if (CHECK_CEM)