Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / tools / perf / builtin-trace.c

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 489cc118a36aea132a39827532b998c9fb37c0d8..4e3abba03062f3e84cfbdea5ca2c07adc641b35b 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -1,3 +1,21 @@
+/*
+ * builtin-trace.c
+ *
+ * Builtin 'trace' command:
+ *
+ * Display a continuously updated trace of any workload, CPU, specific PID,
+ * system wide, etc.  Default format is loosely strace like, but any other
+ * event may be specified using --event.
+ *
+ * Copyright (C) 2012, 2013, 2014, 2015 Red Hat Inc, Arnaldo Carvalho de Melo <acme@redhat.com>
+ *
+ * Initially based on the 'trace' prototype by Thomas Gleixner:
+ *
+ * http://lwn.net/Articles/415728/ ("Announcing a new utility: 'trace'")
+ *
+ * Released under the GPL v2. (and only v2, not any later version)
+ */
+
 #include <traceevent/event-parse.h>
 #include "builtin.h"
 #include "util/color.h"
@@ -27,6 +45,7 @@
 
 #ifndef MADV_HWPOISON
 # define MADV_HWPOISON         100
+
 #endif
 
 #ifndef MADV_MERGEABLE
@@ -1315,7 +1334,10 @@ struct thread_trace {
        double            runtime_ms;
         struct {
                unsigned long ptr;
-               int           entry_str_pos;
+               short int     entry_str_pos;
+               bool          pending_open;
+               unsigned int  namelen;
+               char          *name;
        } filename;
        struct {
                int       max;
@@ -1391,7 +1413,6 @@ struct trace {
                size_t          nr;
                int             *entries;
        }                       ev_qualifier_ids;
-       const char              *last_vfs_getname;
        struct intlist          *tid_list;
        struct intlist          *pid_list;
        struct {
@@ -1966,8 +1987,11 @@ static int trace__sys_enter(struct trace *trace, struct perf_evsel *evsel,
                        trace__fprintf_entry_head(trace, thread, 1, sample->time, trace->output);
                        fprintf(trace->output, "%-70s\n", ttrace->entry_str);
                }
-       } else
+       } else {
                ttrace->entry_pending = true;
+               /* See trace__vfs_getname & trace__sys_exit */
+               ttrace->filename.pending_open = false;
+       }
 
        if (trace->current != thread) {
                thread__put(trace->current);
@@ -2003,9 +2027,9 @@ static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel,
 
        ret = perf_evsel__sc_tp_uint(evsel, ret, sample);
 
-       if (id == trace->audit.open_id && ret >= 0 && trace->last_vfs_getname) {
-               trace__set_fd_pathname(thread, ret, trace->last_vfs_getname);
-               trace->last_vfs_getname = NULL;
+       if (id == trace->audit.open_id && ret >= 0 && ttrace->filename.pending_open) {
+               trace__set_fd_pathname(thread, ret, ttrace->filename.name);
+               ttrace->filename.pending_open = false;
                ++trace->stats.vfs_getname;
        }
 
@@ -2065,9 +2089,7 @@ static int trace__vfs_getname(struct trace *trace, struct perf_evsel *evsel,
        size_t filename_len, entry_str_len, to_move;
        ssize_t remaining_space;
        char *pos;
-       const char *filename;
-
-       trace->last_vfs_getname = perf_evsel__rawptr(evsel, sample, "pathname");
+       const char *filename = perf_evsel__rawptr(evsel, sample, "pathname");
 
        if (!thread)
                goto out;
@@ -2076,6 +2098,21 @@ static int trace__vfs_getname(struct trace *trace, struct perf_evsel *evsel,
        if (!ttrace)
                goto out;
 
+       filename_len = strlen(filename);
+
+       if (ttrace->filename.namelen < filename_len) {
+               char *f = realloc(ttrace->filename.name, filename_len + 1);
+
+               if (f == NULL)
+                               goto out;
+
+               ttrace->filename.namelen = filename_len;
+               ttrace->filename.name = f;
+       }
+
+       strcpy(ttrace->filename.name, filename);
+       ttrace->filename.pending_open = true;
+
        if (!ttrace->filename.ptr)
                goto out;
 
@@ -2084,8 +2121,6 @@ static int trace__vfs_getname(struct trace *trace, struct perf_evsel *evsel,
        if (remaining_space <= 0)
                goto out;
 
-       filename = trace->last_vfs_getname;
-       filename_len = strlen(filename);
        if (filename_len > (size_t)remaining_space) {
                filename += filename_len - remaining_space;
                filename_len = remaining_space;