Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752209AbbDUFAa (ORCPT ); Tue, 21 Apr 2015 01:00:30 -0400 Received: from lgeamrelo02.lge.com ([156.147.1.126]:52357 "EHLO lgeamrelo02.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751772AbbDUFA0 (ORCPT ); Tue, 21 Apr 2015 01:00:26 -0400 X-Original-SENDERIP: 10.177.220.203 X-Original-MAILFROM: namhyung@kernel.org From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , David Ahern , Joonsoo Kim , Minchan Kim , Pekka Enberg , linux-mm@kvack.org Subject: [PATCH 6/6] perf kmem: Show warning when trying to run stat without record Date: Tue, 21 Apr 2015 13:55:07 +0900 Message-Id: <1429592107-1807-7-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 2.3.4 In-Reply-To: <1429592107-1807-1-git-send-email-namhyung@kernel.org> References: <1429592107-1807-1-git-send-email-namhyung@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2208 Lines: 72 Sometimes one can mistakenly run perf kmem stat without perf kmem record before or different configuration like recoding --slab and stat --page. Show a warning message like below to inform user: # perf kmem stat --page --caller Not found page events. Have you run 'perf kmem record --page' before? Acked-by: Pekka Enberg Signed-off-by: Namhyung Kim --- tools/perf/builtin-kmem.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index 828b7284e547..f29a766f18f8 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c @@ -1882,6 +1882,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused) }; struct perf_session *session; int ret = -1; + const char errmsg[] = "Not found %s events. Have you run 'perf kmem record --%s' before?\n"; perf_config(kmem_config, NULL); argc = parse_options_subcommand(argc, argv, kmem_options, @@ -1908,11 +1909,35 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused) if (session == NULL) return -1; + if (kmem_slab) { + struct perf_evsel *evsel; + bool found = false; + + evlist__for_each(session->evlist, evsel) { + if (!strcmp(perf_evsel__name(evsel), "kmem:kmalloc")) { + found = true; + break; + } + } + if (!found) { + pr_err(errmsg, "slab", "slab"); + return -1; + } + } + if (kmem_page) { - struct perf_evsel *evsel = perf_evlist__first(session->evlist); + struct perf_evsel *evsel; + bool found = false; - if (evsel == NULL || evsel->tp_format == NULL) { - pr_err("invalid event found.. aborting\n"); + evlist__for_each(session->evlist, evsel) { + if (!strcmp(perf_evsel__name(evsel), + "kmem:mm_page_alloc")) { + found = true; + break; + } + } + if (!found) { + pr_err(errmsg, "page", "page"); return -1; } -- 2.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/