From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965439AbeALXMb (ORCPT + 1 other); Fri, 12 Jan 2018 18:12:31 -0500 Received: from mail-io0-f194.google.com ([209.85.223.194]:34905 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965260AbeALXM2 (ORCPT ); Fri, 12 Jan 2018 18:12:28 -0500 X-Google-Smtp-Source: ACJfBotARSk7nrVqI5aioX3Rh351hGz1syDxdKMdFpYDGZ1xBxic7QxWh425ZftZi8llfIpPr+aO8Q== From: Mathieu Poirier To: acme@kernel.org Cc: peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com, jolsa@redhat.com, namhyung@kernel.org, yao.jin@linux.intel.com, linux-kernel@vger.kernel.org Subject: [PATCH 1/1] perf util: Do not reuse target->per_thread flag Date: Fri, 12 Jan 2018 16:12:23 -0700 Message-Id: <1515798743-2541-2-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515798743-2541-1-git-send-email-mathieu.poirier@linaro.org> References: <1515798743-2541-1-git-send-email-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Commit ("73c0ca1eee3d perf thread_map: Enumerate all threads from /proc") is using the target->per_thread flag to specify that all threads in a system should be taken into account. That is then used in function thread_map__new_str() where all threads are added to evlist->threads. Variable target->per_thread is also used by 'perf record' when handling trace sessions using the --per-thread command line option. Since the target->per_thread flag is set all threads will be added to evlist->threads, which has the effect of creating a kernel event for each thread in the system. This patch address the issue by creating a new target->all_threads flag that gets set from the 'stat' utility, avoiding any conflict with other utilities using target->per_thread. Signed-off-by: Mathieu Poirier --- tools/perf/builtin-stat.c | 2 +- tools/perf/util/evlist.c | 2 +- tools/perf/util/target.h | 1 + tools/perf/util/thread_map.c | 4 ++-- tools/perf/util/thread_map.h | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 98bf9d32f222..87e156bfb45e 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -2831,7 +2831,7 @@ int cmd_stat(int argc, const char **argv) target__validate(&target); if ((stat_config.aggr_mode == AGGR_THREAD) && (target.system_wide)) - target.per_thread = true; + target.per_thread = target.all_threads = true; if (perf_evlist__create_maps(evsel_list, &target) < 0) { if (target__has_task(&target)) { diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index f0a5e09c4071..c239eb895612 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1106,7 +1106,7 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target) struct thread_map *threads; threads = thread_map__new_str(target->pid, target->tid, target->uid, - target->per_thread); + target->all_threads); if (!threads) return -1; diff --git a/tools/perf/util/target.h b/tools/perf/util/target.h index 6ef01a83b24e..0da8ea2b6801 100644 --- a/tools/perf/util/target.h +++ b/tools/perf/util/target.h @@ -15,6 +15,7 @@ struct target { bool uses_mmap; bool default_per_cpu; bool per_thread; + bool all_threads; }; enum target_errno { diff --git a/tools/perf/util/thread_map.c b/tools/perf/util/thread_map.c index 3e1038f6491c..729dad8f412d 100644 --- a/tools/perf/util/thread_map.c +++ b/tools/perf/util/thread_map.c @@ -323,7 +323,7 @@ struct thread_map *thread_map__new_by_tid_str(const char *tid_str) } struct thread_map *thread_map__new_str(const char *pid, const char *tid, - uid_t uid, bool per_thread) + uid_t uid, bool all_threads) { if (pid) return thread_map__new_by_pid_str(pid); @@ -331,7 +331,7 @@ struct thread_map *thread_map__new_str(const char *pid, const char *tid, if (!tid && uid != UINT_MAX) return thread_map__new_by_uid(uid); - if (per_thread) + if (all_threads) return thread_map__new_all_cpus(); return thread_map__new_by_tid_str(tid); diff --git a/tools/perf/util/thread_map.h b/tools/perf/util/thread_map.h index 0a806b99e73c..5ec91cfd1869 100644 --- a/tools/perf/util/thread_map.h +++ b/tools/perf/util/thread_map.h @@ -31,7 +31,7 @@ struct thread_map *thread_map__get(struct thread_map *map); void thread_map__put(struct thread_map *map); struct thread_map *thread_map__new_str(const char *pid, - const char *tid, uid_t uid, bool per_thread); + const char *tid, uid_t uid, bool all_threads); struct thread_map *thread_map__new_by_tid_str(const char *tid_str); -- 2.7.4