1 files changed, 22 insertions, 6 deletions

diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
index 70c5cf87d020..e437edb72417 100644
--- a/tools/perf/util/build-id.c
+++ b/tools/perf/util/build-id.c
@@ -12,6 +12,7 @@
 #include "event.h"
 #include "symbol.h"
 #include <linux/kernel.h>
+#include "debug.h"
 
 static int build_id__mark_dso_hit(event_t *event, struct perf_session *session)
 {
@@ -34,28 +35,43 @@ static int build_id__mark_dso_hit(event_t *event, struct perf_session *session)
         return 0;
 }
 
+static int event__exit_del_thread(event_t *self, struct perf_session *session)
+{
+        struct thread *thread = perf_session__findnew(session, self->fork.tid);
+
+        dump_printf("(%d:%d):(%d:%d)\n", self->fork.pid, self->fork.tid,
+                    self->fork.ppid, self->fork.ptid);
+
+        if (thread) {
+                rb_erase(&thread->rb_node, &session->threads);
+                session->last_match = NULL;
+                thread__delete(thread);
+        }
+
+        return 0;
+}
+
 struct perf_event_ops build_id__mark_dso_hit_ops = {
         .sample = build_id__mark_dso_hit,
         .mmap   = event__process_mmap,
         .fork   = event__process_task,
+        .exit   = event__exit_del_thread,
 };
 
 char *dso__build_id_filename(struct dso *self, char *bf, size_t size)
 {
         char build_id_hex[BUILD_ID_SIZE * 2 + 1];
-        const char *home;
 
         if (!self->has_build_id)
                 return NULL;
 
         build_id__sprintf(self->build_id, sizeof(self->build_id), build_id_hex);
-        home = getenv("HOME");
         if (bf == NULL) {
-                if (asprintf(&bf, "%s/%s/.build-id/%.2s/%s", home,
-                             DEBUG_CACHE_DIR, build_id_hex, build_id_hex + 2) < 0)
+                if (asprintf(&bf, "%s/.build-id/%.2s/%s", buildid_dir,
+                             build_id_hex, build_id_hex + 2) < 0)
                         return NULL;
         } else
-                snprintf(bf, size, "%s/%s/.build-id/%.2s/%s", home,
-                         DEBUG_CACHE_DIR, build_id_hex, build_id_hex + 2);
+                snprintf(bf, size, "%s/.build-id/%.2s/%s", buildid_dir,
+                         build_id_hex, build_id_hex + 2);
         return bf;
 }