From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934233AbcKDGot (ORCPT ); Fri, 4 Nov 2016 02:44:49 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:36374 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934138AbcKDGog (ORCPT ); Fri, 4 Nov 2016 02:44:36 -0400 From: Taeung Song To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Namhyung Kim , Ingo Molnar , Peter Zijlstra , Wang Nan , Nambong Ha , Wookje Kwon , Taeung Song Subject: [PATCH 3/6] perf config: Parse config variable arguments before getting functionality Date: Fri, 4 Nov 2016 15:44:19 +0900 Message-Id: <1478241862-31230-4-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1478241862-31230-1-git-send-email-treeze.taeung@gmail.com> References: <1478241862-31230-1-git-send-email-treeze.taeung@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org You can get several config items as below, # perf config report.queue-size call-graph.record-mode but it would be needed to more precisely check arguments, before show_spec_config() takes over the arguments. The function would be also used when parse config key-value pairs arguments in the near future. Cc: Namhyung Kim Cc: Jiri Olsa Cc: Wang Nan Signed-off-by: Taeung Song --- tools/perf/builtin-config.c | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index df3fa1c..fe253f3 100644 --- a/tools/perf/builtin-config.c +++ b/tools/perf/builtin-config.c @@ -82,6 +82,27 @@ static int show_config(struct perf_config_set *set) return 0; } +static int parse_config_arg(char *arg, char **var) +{ + const char *last_dot = strchr(arg, '.'); + + /* + * Since "var" actually contains the section name and the real + * config variable name separated by a dot, we have to know where the dot is. + */ + if (last_dot == NULL || last_dot == arg) { + pr_err("The config variable does not contain a section: %s\n", arg); + return -1; + } + if (!last_dot[1]) { + pr_err("The config varible does not contain variable name: %s\n", arg); + return -1; + } + + *var = arg; + return 0; +} + int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused) { int i, ret = 0; @@ -130,10 +151,26 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused) } break; default: - if (argc) - for (i = 0; argv[i]; i++) - ret = show_spec_config(set, argv[i]); - else + if (argc) { + for (i = 0; argv[i]; i++) { + char *var, *arg = strdup(argv[i]); + + if (!arg) { + pr_err("%s: strdup failed\n", __func__); + ret = -1; + break; + } + + if (parse_config_arg(arg, &var) < 0) { + free(arg); + ret = -1; + break; + } + + ret = show_spec_config(set, var); + free(arg); + } + } else usage_with_options(config_usage, config_options); } -- 2.7.4