Increase the threshold above which new errors are not shown from 300
unique / 30000 total to 1000 unique / 100000 total. Programs are
generally bigger now than 3 years ago.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4957 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/m_errormgr.c b/coregrind/m_errormgr.c
index 8149b70..c06a509 100644
--- a/coregrind/m_errormgr.c
+++ b/coregrind/m_errormgr.c
@@ -51,16 +51,16 @@
/* After this many different unsuppressed errors have been observed,
be more conservative about collecting new ones. */
-#define M_COLLECT_ERRORS_SLOWLY_AFTER 50
+#define M_COLLECT_ERRORS_SLOWLY_AFTER 100
/* After this many different unsuppressed errors have been observed,
stop collecting errors at all, and tell the user their program is
evidently a steaming pile of camel dung. */
-#define M_COLLECT_NO_ERRORS_AFTER_SHOWN 300
+#define M_COLLECT_NO_ERRORS_AFTER_SHOWN 1000
/* After this many total errors have been observed, stop collecting
errors at all. Counterpart to M_COLLECT_NO_ERRORS_AFTER_SHOWN. */
-#define M_COLLECT_NO_ERRORS_AFTER_FOUND 30000
+#define M_COLLECT_NO_ERRORS_AFTER_FOUND 100000
/* The list of error contexts found, both suppressed and unsuppressed.
Initially empty, and grows as errors are detected. */
diff --git a/docs/valgrind.1 b/docs/valgrind.1
index 25ef8b7..f106382 100644
--- a/docs/valgrind.1
+++ b/docs/valgrind.1
@@ -137,8 +137,8 @@
.TP
.B
--error-limit=<yes|no> [default: yes]
-When enabled, \fBvalgrind\fP stops reporting errors after 30000 in total,
-or 300 different ones, have been seen. This is to stop the error tracking
+When enabled, \fBvalgrind\fP stops reporting errors after 100000 in total,
+or 1000 different ones, have been seen. This is to stop the error tracking
machinery from becoming a huge performance overhead in programs with
many errors.
diff --git a/docs/xml/manual-core.xml b/docs/xml/manual-core.xml
index 5200070..57b9bed 100644
--- a/docs/xml/manual-core.xml
+++ b/docs/xml/manual-core.xml
@@ -348,10 +348,10 @@
expensive one and can become a significant performance overhead
if your program generates huge quantities of errors. To avoid
serious problems here, Valgrind will simply stop collecting
-errors after 300 different errors have been seen, or 30000 errors
+errors after 1000 different errors have been seen, or 100000 errors
in total have been seen. In this situation you might as well
stop your program and fix it, because Valgrind won't tell you
-anything else useful after this. Note that the 300/30000 limits
+anything else useful after this. Note that the 1000/100000 limits
apply after suppressed errors are removed. These limits are
defined in <filename>m_errormgr.c</filename> and can be increased
if necessary.</para>
@@ -769,7 +769,7 @@
[default]</para>
<para><computeroutput>--error-limit=no</computeroutput></para>
<para>When enabled, Valgrind stops reporting errors after
- 30000 in total, or 300 different ones, have been seen. This
+ 100000 in total, or 1000 different ones, have been seen. This
is to stop the error tracking machinery from becoming a huge
performance overhead in programs with many errors.</para>
</listitem>
diff --git a/memcheck/tests/x86/scalar.stderr.exp b/memcheck/tests/x86/scalar.stderr.exp
index c775571..55153df 100644
--- a/memcheck/tests/x86/scalar.stderr.exp
+++ b/memcheck/tests/x86/scalar.stderr.exp
@@ -330,9 +330,6 @@
by 0x........: __libc_start_main (in /...libc...)
by 0x........: ...
-More than 50 errors detected. Subsequent errors
-will still be recorded, but in less detail than before.
-
Syscall param mount(source) points to unaddressable byte(s)
at 0x........: syscall (in /...libc...)
by 0x........: __libc_start_main (in /...libc...)
@@ -708,6 +705,9 @@
55: __NR_fcntl (GETLK) 1s 0m
-----------------------------------------------------
+More than 100 errors detected. Subsequent errors
+will still be recorded, but in less detail than before.
+
Syscall param fcntl(lock) contains uninitialised byte(s)
at 0x........: syscall (in /...libc...)
by 0x........: __libc_start_main (in /...libc...)