Merge tag 'powerpc-4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[mirror_ubuntu-hirsute-kernel.git] / tools / perf / builtin-stat.c

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index b86aba1c8028f0fae6043cefdc96e61adbbafe30..a635abfa77b6a9e38fa7aa994ea4cfd31608f16a 100644 (file)
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -383,30 +383,26 @@ static bool perf_evsel__should_store_id(struct perf_evsel *counter)
        return STAT_RECORD || counter->attr.read_format & PERF_FORMAT_ID;
 }
 
-static struct perf_evsel *perf_evsel__reset_weak_group(struct perf_evsel *evsel)
+static bool is_target_alive(struct target *_target,
+                           struct thread_map *threads)
 {
-       struct perf_evsel *c2, *leader;
-       bool is_open = true;
+       struct stat st;
+       int i;
 
-       leader = evsel->leader;
-       pr_debug("Weak group for %s/%d failed\n",
-                       leader->name, leader->nr_members);
+       if (!target__has_task(_target))
+               return true;
 
-       /*
-        * for_each_group_member doesn't work here because it doesn't
-        * include the first entry.
-        */
-       evlist__for_each_entry(evsel_list, c2) {
-               if (c2 == evsel)
-                       is_open = false;
-               if (c2->leader == leader) {
-                       if (is_open)
-                               perf_evsel__close(c2);
-                       c2->leader = c2;
-                       c2->nr_members = 0;
-               }
+       for (i = 0; i < threads->nr; i++) {
+               char path[PATH_MAX];
+
+               scnprintf(path, PATH_MAX, "%s/%d", procfs__mountpoint(),
+                         threads->map[i].pid);
+
+               if (!stat(path, &st))
+                       return true;
        }
-       return leader;
+
+       return false;
 }
 
 static int __run_perf_stat(int argc, const char **argv, int run_idx)
@@ -455,7 +451,7 @@ try_again:
                        if ((errno == EINVAL || errno == EBADF) &&
                            counter->leader != counter &&
                            counter->weak_group) {
-                               counter = perf_evsel__reset_weak_group(counter);
+                               counter = perf_evlist__reset_weak_group(evsel_list, counter);
                                goto try_again;
                        }
 
@@ -579,6 +575,8 @@ try_again:
                enable_counters();
                while (!done) {
                        nanosleep(&ts, NULL);
+                       if (!is_target_alive(&target, evsel_list->threads))
+                               break;
                        if (timeout)
                                break;
                        if (interval) {