|
From: <sv...@va...> - 2007-09-18 23:30:16
|
Author: njn
Date: 2007-09-19 00:30:07 +0100 (Wed, 19 Sep 2007)
New Revision: 6863
Log:
tweak top-of-graph output
Modified:
branches/MASSIF2/massif/ms_main.c
branches/MASSIF2/massif/ms_print
branches/MASSIF2/massif/tests/basic.post.exp
Modified: branches/MASSIF2/massif/ms_main.c
===================================================================
--- branches/MASSIF2/massif/ms_main.c 2007-09-18 19:29:25 UTC (rev 6862)
+++ branches/MASSIF2/massif/ms_main.c 2007-09-18 23:30:07 UTC (rev 6863)
@@ -406,7 +406,7 @@
static Bool clo_heap = True;
static UInt clo_heap_admin = 8;
static Bool clo_stacks = True;
-static Bool clo_depth = 8;
+static UInt clo_depth = 8;
static UInt clo_threshold = 100; // 100 == 1%
static UInt clo_time_unit = TimeMS;
@@ -1516,12 +1516,16 @@
}
// Print description lines. Include:
- // * --heap-admin value
- // * --depth number
- // * --stacks value
// * --alloc-fn values
// * --threshold values
- FP("desc: XXX\n");
+ FP("desc: Options: XXX\n");
+// FP("desc: Options: Heap profiling %s. Stack profiling %s\n",
+// clo_heap ? "on" : "off", clo_stacks ? "on" : "off");
+// FP("desc: Options: Heap admin size = %u bytes.\n", clo_heap_admin);
+// FP("desc: Options: Max. tree depth = %u calls.\n", clo_depth);
+// FP("desc: Options: Significance threshold = %s\n",
+// make_perc(clo_threshold, 10000));
+// FP("desc: Allocation functions = ...");
// Print "cmd:" line.
FP("cmd: ");
Modified: branches/MASSIF2/massif/ms_print
===================================================================
--- branches/MASSIF2/massif/ms_print 2007-09-18 19:29:25 UTC (rev 6862)
+++ branches/MASSIF2/massif/ms_print 2007-09-18 23:30:07 UTC (rev 6863)
@@ -30,8 +30,6 @@
use warnings;
use strict;
-# XXX:need to put threshold in the stats at the top of the output
-
# XXX:
# - move graph printing stuff into a separate subroutine
# - implement --threshold
@@ -364,9 +362,9 @@
# Print header
#-------------------------------------------------------------------------
print($fancy);
- print("Command: $cmd\n");
- print("Data file: $input_file\n");
- print("Description: $desc\n");
+ print("Command: $cmd\n");
+ print("Data file: $input_file\n");
+ print("$desc\n");
print("\n");
#-------------------------------------------------------------------------
Modified: branches/MASSIF2/massif/tests/basic.post.exp
===================================================================
--- branches/MASSIF2/massif/tests/basic.post.exp 2007-09-18 19:29:25 UTC (rev 6862)
+++ branches/MASSIF2/massif/tests/basic.post.exp 2007-09-18 23:30:07 UTC (rev 6863)
@@ -1,7 +1,7 @@
--------------------------------------------------------------------------------
-Command: ./basic
-Data file: massif.out
-Description: XXX
+Command: ./basic
+Data file: massif.out
+Options: XXX
3.9k| :
|