perf script: Make printing of dso a separate field option

The 'sym' option displays both the function name and the DSO it comes
from. Split the display of the dso into a separate option.  This allows
display of the ip address and symbol without the dso, thus shortening
line lengths - and decluttering the output a bit.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1306528124-25861-3-git-send-email-dsahern@gmail.com
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt
index 67a4e5cbc880455d637e974cca66adc5de29ba5f..1e744c2391dce79e0a22d5956f70d792252b52af 100644 (file)
--- a/tools/perf/Documentation/perf-script.txt
+++ b/tools/perf/Documentation/perf-script.txt
@@ -115,7 +115,7 @@ OPTIONS
 -f::
 --fields::
         Comma separated list of fields to print. Options are:
-        comm, tid, pid, time, cpu, event, trace, ip, sym. Field
+        comm, tid, pid, time, cpu, event, trace, ip, sym, dso. Field
         list can be prepended with the type, trace, sw or hw,
         to indicate to which event type the field list applies.
         e.g., -f sw:comm,tid,time,ip,sym  and -f trace:time,cpu,trace

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 0852db2ea155183c3a4abdc20eea10a64c37884d..a8bd00f2e5573ff267c6512a59418588c0254f30 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -32,6 +32,7 @@ enum perf_output_field {
        PERF_OUTPUT_TRACE           = 1U << 6,
        PERF_OUTPUT_IP              = 1U << 7,
        PERF_OUTPUT_SYM             = 1U << 8,
+       PERF_OUTPUT_DSO             = 1U << 9,
 };
 
 struct output_option {
@@ -47,6 +48,7 @@ struct output_option {
        {.str = "trace", .field = PERF_OUTPUT_TRACE},
        {.str = "ip",    .field = PERF_OUTPUT_IP},
        {.str = "sym",   .field = PERF_OUTPUT_SYM},
+       {.str = "dso",   .field = PERF_OUTPUT_DSO},
 };
 
 /* default set to maintain compatibility with current format */
@@ -63,7 +65,7 @@ static struct {
                .fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |
                              PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |
                              PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |
-                                 PERF_OUTPUT_SYM,
+                                 PERF_OUTPUT_SYM | PERF_OUTPUT_DSO,
 
                .invalid_fields = PERF_OUTPUT_TRACE,
        },
@@ -74,7 +76,7 @@ static struct {
                .fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |
                              PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |
                              PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |
-                                 PERF_OUTPUT_SYM,
+                                 PERF_OUTPUT_SYM | PERF_OUTPUT_DSO,
 
                .invalid_fields = PERF_OUTPUT_TRACE,
        },
@@ -93,7 +95,7 @@ static struct {
                .fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |
                              PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |
                              PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |
-                                 PERF_OUTPUT_SYM,
+                                 PERF_OUTPUT_SYM | PERF_OUTPUT_DSO,
 
                .invalid_fields = PERF_OUTPUT_TRACE,
        },
@@ -176,6 +178,11 @@ static int perf_evsel__check_attr(struct perf_evsel *evsel,
                       "No addresses to convert to symbols.\n");
                return -EINVAL;
        }
+       if (PRINT_FIELD(DSO) && !PRINT_FIELD(IP)) {
+               pr_err("Display of DSO requested but IP is not selected.\n"
+                      "No addresses to convert to dso.\n");
+               return -EINVAL;
+       }
 
        if ((PRINT_FIELD(PID) || PRINT_FIELD(TID)) &&
                perf_event_attr__check_stype(attr, PERF_SAMPLE_TID, "TID",
@@ -304,7 +311,7 @@ static void process_event(union perf_event *event __unused,
                else
                        printf("\n");
                perf_session__print_ip(event, sample, session,
-                                             PRINT_FIELD(SYM));
+                                             PRINT_FIELD(SYM), PRINT_FIELD(DSO));
        }
 
        printf("\n");
@@ -996,7 +1003,7 @@ static const struct option options[] = {
        OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
                    "Look for files with symbols relative to this directory"),
        OPT_CALLBACK('f', "fields", NULL, "str",
-                    "comma separated output fields prepend with 'type:'. Valid types: hw,sw,trace,raw. Fields: comm,tid,pid,time,cpu,event,trace,ip,sym",
+                    "comma separated output fields prepend with 'type:'. Valid types: hw,sw,trace,raw. Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso",
                     parse_output_fields),
 
        OPT_END()

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index ad33650cdd4181a3123cfa2f46e2ac2b348904d8..0dd4182992619d083b1e3487b4042169d686b904 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1205,7 +1205,7 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session,
 void perf_session__print_ip(union perf_event *event,
                            struct perf_sample *sample,
                            struct perf_session *session,
-                           int print_sym)
+                           int print_sym, int print_dso)
 {
        struct addr_location al;
        const char *symname, *dsoname;
@@ -1241,12 +1241,15 @@ void perf_session__print_ip(union perf_event *event,
                                else
                                        symname = "";
 
+                               printf(" %s", symname);
+                       }
+                       if (print_dso) {
                                if (node->map && node->map->dso && node->map->dso->name)
                                        dsoname = node->map->dso->name;
                                else
                                        dsoname = "";
 
-                               printf(" %s (%s)", symname, dsoname);
+                               printf(" (%s)", dsoname);
                        }
                        printf("\n");
 
@@ -1261,12 +1264,16 @@ void perf_session__print_ip(union perf_event *event,
                        else
                                symname = "";
 
+                       printf(" %s", symname);
+               }
+
+               if (print_dso) {
                        if (al.map && al.map->dso && al.map->dso->name)
                                dsoname = al.map->dso->name;
                        else
                                dsoname = "";
 
-                       printf(" %s (%s)", symname, dsoname);
+                       printf(" (%s)", dsoname);
                }
        }
 }

diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index d76af0f975d34d3f8d84babd4a775720ab9c32e5..de4178d7bb7bb4fed28b06c87a4ad06fa7a01645 100644 (file)
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -170,6 +170,6 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session,
 void perf_session__print_ip(union perf_event *event,
                                 struct perf_sample *sample,
                                 struct perf_session *session,
-                                int print_sym);
+                                int print_sym, int print_dso);
 
 #endif /* __PERF_SESSION_H */