1 files changed, 28 insertions, 5 deletions

diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
index 12c7a253a63c..c41411726c7a 100644
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c
@@ -7,6 +7,7 @@
 #include "util.h"
 #include "debug.h"
 #include "comm.h"
+#include "unwind.h"
 
 int thread__init_map_groups(struct thread *thread, struct machine *machine)
 {
@@ -37,17 +38,21 @@ struct thread *thread__new(pid_t pid, pid_t tid)
                 thread->cpu = -1;
                 INIT_LIST_HEAD(&thread->comm_list);
 
+                if (unwind__prepare_access(thread) < 0)
+                        goto err_thread;
+
                 comm_str = malloc(32);
                 if (!comm_str)
                         goto err_thread;
 
                 snprintf(comm_str, 32, ":%d", tid);
-                comm = comm__new(comm_str, 0);
+                comm = comm__new(comm_str, 0, false);
                 free(comm_str);
                 if (!comm)
                         goto err_thread;
 
                 list_add(&comm->list, &thread->comm_list);
+
         }
 
         return thread;
@@ -69,6 +74,7 @@ void thread__delete(struct thread *thread)
                 list_del(&comm->list);
                 comm__free(comm);
         }
+        unwind__finish_access(thread);
 
         free(thread);
 }
@@ -81,22 +87,39 @@ struct comm *thread__comm(const struct thread *thread)
         return list_first_entry(&thread->comm_list, struct comm, list);
 }
 
+struct comm *thread__exec_comm(const struct thread *thread)
+{
+        struct comm *comm, *last = NULL;
+
+        list_for_each_entry(comm, &thread->comm_list, list) {
+                if (comm->exec)
+                        return comm;
+                last = comm;
+        }
+
+        return last;
+}
+
 /* CHECKME: time should always be 0 if event aren't ordered */
-int thread__set_comm(struct thread *thread, const char *str, u64 timestamp)
+int __thread__set_comm(struct thread *thread, const char *str, u64 timestamp,
+                       bool exec)
 {
         struct comm *new, *curr = thread__comm(thread);
         int err;
 
         /* Override latest entry if it had no specific time coverage */
-        if (!curr->start) {
-                err = comm__override(curr, str, timestamp);
+        if (!curr->start && !curr->exec) {
+                err = comm__override(curr, str, timestamp, exec);
                 if (err)
                         return err;
         } else {
-                new = comm__new(str, timestamp);
+                new = comm__new(str, timestamp, exec);
                 if (!new)
                         return -ENOMEM;
                 list_add(&new->list, &thread->comm_list);
+
+                if (exec)
+                        unwind__flush_access(thread);
         }
 
         thread->comm_set = true;