This is to have a consistent view of all graph tracer options.
The original option '--graph-depth' is marked as deprecated.

Signed-off-by: Changbin Du <changbin...@gmail.com>
---
 tools/perf/Documentation/perf-ftrace.txt | 5 +----
 tools/perf/builtin-ftrace.c              | 5 ++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/tools/perf/Documentation/perf-ftrace.txt 
b/tools/perf/Documentation/perf-ftrace.txt
index 96e5e8d7f65c..6f17939b8789 100644
--- a/tools/perf/Documentation/perf-ftrace.txt
+++ b/tools/perf/Documentation/perf-ftrace.txt
@@ -95,16 +95,13 @@ OPTIONS
        This can be used more than once to specify multiple functions.
        It will be passed to 'set_graph_notrace' in tracefs.
 
--D::
---graph-depth=::
-       Set max depth for function graph tracer to follow
-
 --graph-opts::
        List of options allowed to set:
          nosleep-time - Measure on-CPU time only for function_graph tracer.
          noirqs       - Ignore functions that happen inside interrupt.
          verbose      - Show process names, PIDs, timestamps, etc.
          thresh=<n>   - Setup trace duration threshold in microseconds.
+         depth=<n>    - Set max depth for function graph tracer to follow.
 
 SEE ALSO
 --------
diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
index 5d948239bd70..3ddd7568b456 100644
--- a/tools/perf/builtin-ftrace.c
+++ b/tools/perf/builtin-ftrace.c
@@ -750,6 +750,7 @@ static int parse_graph_tracer_opts(const struct option *opt,
                { .name = "noirqs",             .value_ptr = 
&ftrace->graph_noirqs },
                { .name = "verbose",            .value_ptr = 
&ftrace->graph_verbose },
                { .name = "thresh",             .value_ptr = 
&ftrace->graph_thresh },
+               { .name = "depth",              .value_ptr = 
&ftrace->graph_depth },
                { .name = NULL, }
        };
 
@@ -801,10 +802,8 @@ int cmd_ftrace(int argc, const char **argv)
                     parse_filter_func),
        OPT_CALLBACK('g', "nograph-funcs", &ftrace.nograph_funcs, "func",
                     "Set nograph filter on given functions", 
parse_filter_func),
-       OPT_INTEGER('D', "graph-depth", &ftrace.graph_depth,
-                   "Max depth for function graph tracer"),
        OPT_CALLBACK(0, "graph-opts", &ftrace, "options",
-                    "graph tracer options, available options: 
nosleep-time,noirqs,verbose,thresh=<n>",
+                    "graph tracer options, available options: 
nosleep-time,noirqs,verbose,thresh=<n>,depth=<n>",
                     parse_graph_tracer_opts),
        OPT_CALLBACK('m', "buffer-size", &ftrace.percpu_buffer_size, "size",
                     "size of per cpu buffer", parse_buffer_size),
-- 
2.25.1

Reply via email to