From: Leif Madsen <leif@leifmadsen.com>
Date: Thu, 22 Oct 2009 21:54:00 +0000 (+0000)
Subject: Merged revisions 225485 via svnmerge from
X-Git-Tag: 1.6.1.10-rc1~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09cd0f9b0dbf01fa5a010c3542b8957f048bf9c4;p=thirdparty%2Fasterisk.git

Merged revisions 225485 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r225485 | lmadsen | 2009-10-22 16:52:30 -0500 (Thu, 22 Oct 2009) | 19 lines

  Merged revisions 225484 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r225484 | lmadsen | 2009-10-22 16:51:52 -0500 (Thu, 22 Oct 2009) | 11 lines

    Clean valgrind output by suppressing false errors.
    Update valgrind.txt documentation and add valgrind.supp file in order to
    allow those who are creating valgrind output to have less false errors in
    the logfile.

    (closes issue #16007)
    Reported by: atis
    Patches:
          valgrind.txt.diff uploaded by atis (license 242)
          asterisk2.supp uploaded by atis (license 242)
    Tested by: atis, amorsen
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@225487 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/contrib/valgrind.supp b/contrib/valgrind.supp
new file mode 100644
index 0000000000..3a4097c362
--- /dev/null
+++ b/contrib/valgrind.supp
@@ -0,0 +1,41 @@
+#
+# _dl_close errors
+#
+
+{
+   dlclose-1
+   Memcheck:Addr1
+   ...
+   fun:dlclose
+   fun:load_dynamic_module
+   ...
+}
+{
+   dlclose-2
+   Memcheck:Addr2
+   ...
+   fun:dlclose
+   fun:load_dynamic_module
+   ...
+}
+{
+   dlclose-4
+   Memcheck:Addr4
+   ...
+   fun:dlclose
+   fun:load_dynamic_module
+   ...
+}
+
+
+#
+# codec_speex
+#
+
+{
+   speex_decode
+   Memcheck:Cond
+   fun:speex_decode_int
+   ...
+}
+
diff --git a/doc/valgrind.txt b/doc/valgrind.txt
index b4a69e2167..3d68e54e3e 100644
--- a/doc/valgrind.txt
+++ b/doc/valgrind.txt
@@ -11,18 +11,12 @@ of information about the crash.
 2.  Rebuild and install Asterisk.
 
 3.  Run Asterisk as follows:
-	valgrind --log-file-exactly=valgrind.txt asterisk -vvvvcg 2>malloc_debug.txt
-
-	UPDATE:  The newest version of valgrind has eliminated the
-	--log-file-exactly option.  If you are running valgrind 3.3.0 or higher,
-	just use the --log-file option, keeping in mind that Valgrind will append
-	a trailing suffix onto valgrind.txt.
+	valgrind --suppressions=/usr/src/asterisk/contrib/valgrind.supp --log-fd=9 asterisk -vvvvcg 9>valgrind.txt
+	
+	Where /usr/src/asterisk/ is location of asterisk source code.
 
 4.  Reproduce the issue.  Following the manifestation of the issue (or when
-	the process crashes), upload the two files, valgrind.txt and
-	malloc_debug.txt to the issue tracker.  If you are using the --log-file
-	option, note that valgrind.txt will have a trailing suffix.  That's fine,
-	just upload that file.
+	the process crashes), upload the valgrind.txt to the issue tracker.
 
 Please note that even if valgrind prevents Asterisk from crashing, the
 information logged may STILL be of use to developers, so please upload the