xtree: CALLED_FLF must be called only up to ips[0] + minor doc update

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

diff --git a/coregrind/m_xtree.c b/coregrind/m_xtree.c
index c5211416338580812f3121e417a056055ad30584..760cd34a99446ac94102eea6bef279dc2cd67bcb 100644 (file)
--- a/coregrind/m_xtree.c
+++ b/coregrind/m_xtree.c
@@ -546,8 +546,8 @@ void VG_(XT_callgrind_print)
             else
                FP("%d\n", called_linenum); //no self cost.
             prev_linenum = called_linenum;
-            CALLED_FLF(ips_idx-1);
             if (ips_idx >= 1) {
+               CALLED_FLF(ips_idx-1);
                FP_pos_str(fp, "cfi", called_filename_nr,
                           called_filename, called_filename_new);
                FP_pos_str(fp, "cfn", called_fnname_nr,

diff --git a/docs/xml/manual-core.xml b/docs/xml/manual-core.xml
index 2b4705e3f1fe53425bfd8de2719bb68ec96cebaa..e1a89823da41dfd2b8f195264f825e26b29a96b7 100644 (file)
--- a/docs/xml/manual-core.xml
+++ b/docs/xml/manual-core.xml
@@ -2858,11 +2858,15 @@ the "Massif Format".</para>
 
 </itemizedlist>
 
-<para>Note that the Callgrind Format is more compact than the Massif Format,
-  and contains the full data : there is no filtering during file production,
-  filtering is done by visualisers such as kcachegrind. kcachegrind is
-  particularly easy to use to analyse big xtree data containing multiple
-  events counts or resources consumption.</para>
+<para>Note that for equivalent information, the Callgrind Format is more compact
+  than the Massif Format.  However, the Callgrind Format always contains the
+  full data: there is no filtering done during file production, filtering is
+  done by visualisers such as kcachegrind. kcachegrind is particularly easy to
+  use to analyse big xtree data containing multiple events counts or resources
+  consumption.  The Massif Format (optionally) only contains a part of the data.
+  For example, the Massif tool might filter some of the data, according to the
+  <option>--threshold</option> option.
+</para>
 
 <para>To clarify the xtree concept, the below gives several extracts of
   the output produced by the following commands: