Increase the maximum size of the conflict cache even more, to 30

million.

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

diff --git a/helgrind/hg_main.c b/helgrind/hg_main.c
index 2e4ff1d8d30c9a6025b14b53693a68d0b04a6ec5..31cec56a10cddf69e88a03fd59a28a4d6571971b 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/20mill limits, remember to also change
+   /* If you change the 10k/30mill 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, 20*1000*1000) {}
+                       HG_(clo_conflict_cache_size), 10*1000, 30*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 7b0e97621ece94c14584b47d8d4e2956c65e077c..0a07f4bedff01edb65a933536bce42b8464158ee 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) <= 20*1000*1000 );
+   tl_assert( HG_(clo_conflict_cache_size) <= 30*1000*1000 );
 
    /* Check our counting is sane (expensive) */
    if (CHECK_CEM)