From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Date: Sun, 25 Nov 2018 18:51:53 +0000 (+0100)
Subject: Always output all leak kinds in a xtree leak result file.
X-Git-Tag: VALGRIND_3_15_0~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c26e71c096addf193502334c69b06abe3d86766;p=thirdparty%2Fvalgrind.git

Always output all leak kinds in a xtree leak result file.

- The option --xtree-leak=yes (to output leak result in xtree format)
  automatically activates the option --show-leak-kinds=all,
  as xtree visualisation tools such as kcachegrind can in any case
  select what kind of leak to visualise.
---

diff --git a/NEWS b/NEWS
index 8b6d4b361b..c311665804 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,12 @@ support for X86/macOS 10.13, AMD64/macOS 10.13.
   - The default value for --read-inline-info is now "yes" on
     Linux/Android/Solaris. It is still "no" on other OS.
 
+* Memcheck:
+  - The option --xtree-leak=yes (to output leak result in xtree format)
+    automatically activates the option --show-leak-kinds=all,
+    as xtree visualisation tools such as kcachegrind can in any case
+    select what kind of leak to visualise.
+
 * ==================== OTHER CHANGES ====================
 
 
diff --git a/memcheck/docs/mc-manual.xml b/memcheck/docs/mc-manual.xml
index eb1dfab272..a993479a9c 100644
--- a/memcheck/docs/mc-manual.xml
+++ b/memcheck/docs/mc-manual.xml
@@ -888,9 +888,11 @@ is <option>--errors-for-leak-kinds=definite,possible</option>
     <listitem>
       <para>If set to yes, the results for the leak search done at exit will be
         output in a 'Callgrind Format' execution tree file. Note that this
-        automatically sets the option <option>--leak-check=full</option>.
-        The produced file
-       will contain the following events:</para>
+        automatically sets the options <option>--leak-check=full</option>
+        and <option>--show-leak-kinds=all</option>, to allow
+        xtree visualisation tools such as kcachegrind to select what kind
+        to leak to visualise.
+        The produced file will contain the following events:</para>
       <itemizedlist>
         <listitem><para><option>RB</option> : Reachable Bytes</para></listitem> 
          <listitem><para><option>PB</option> : Possibly lost Bytes</para></listitem>
diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index 9b2e654902..3ef7cb9138 100644
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -7997,6 +7997,7 @@ static void mc_fini ( Int exitcode )
                                              MC_(clo_xtree_leak_file));
          lcp.xt_filename = xt_filename;
          lcp.mode = LC_Full;
+         lcp.show_leak_kinds = MC_(all_Reachedness)();
       }
       else
          lcp.xt_filename = NULL;