From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751626AbbJDIjw (ORCPT ); Sun, 4 Oct 2015 04:39:52 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:34842 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751388AbbJDIjQ (ORCPT ); Sun, 4 Oct 2015 04:39:16 -0400 From: Taeung Song To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, jolsa@redhat.com, namhyung@kernel.org, Ingo Molnar , Taeung Song Subject: [PATCH v7 6/7] perf config: normalize a value depending on default type of it Date: Sun, 4 Oct 2015 16:35:09 +0900 Message-Id: <1443944110-6414-7-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1443944110-6414-1-git-send-email-treeze.taeung@gmail.com> References: <1443944110-6414-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 Whether or not user mis-type wrong data type to set config, normalize the value. If a config user enter isn't contained in default configs, just pass as it is. For the examples, # perf config report.queue-size=1M # perf config report.queue-size report.queue-size=1048576 Signed-off-by: Taeung Song --- tools/perf/builtin-config.c | 48 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index f034c19..680a655 100644 --- a/tools/perf/builtin-config.c +++ b/tools/perf/builtin-config.c @@ -483,6 +483,48 @@ static int show_spec_config(struct list_head *sections, return -1; } +static char *normalize_value(const char *section_name, const char *name, const char *value) +{ + int i, ret = 0; + char key[BUFSIZ]; + char *normalized; + + scnprintf(key, sizeof(key), "%s.%s", section_name, name); + for (i = 0; default_configsets[i].section_name != NULL; i++) { + struct default_configset *config = &default_configsets[i]; + + if (!strcmp(config->section_name, section_name) + && !strcmp(config->name, name)) { + if (!config->type) + ret = asprintf(&normalized, "%s", value); + else if (!strcmp(config->type, TYPE_BOOL)) + ret = asprintf(&normalized, "%s", + perf_config_bool(key, value) ? "true" : "false"); + else if (!strcmp(config->type, TYPE_INT)) + ret = asprintf(&normalized, "%d", + perf_config_int(key, value)); + else if (!strcmp(config->type, TYPE_LONG)) + ret = asprintf(&normalized, "%"PRId64, + perf_config_u64(key, value)); + else if (!strcmp(config->type, TYPE_DIRNAME)) + ret = asprintf(&normalized, "%s", + perf_config_dirname(key, value)); + if (ret < 0) + return NULL; + + return normalized; + } + } + + normalized = strdup(value); + if (!normalized) { + pr_err("%s: strdup failed\n", __func__); + return NULL; + } + + return normalized; +} + static int set_config(struct list_head *sections, const char *config_file_name, const char *section_name, const char *name, char *value) { @@ -491,11 +533,7 @@ static int set_config(struct list_head *sections, const char *config_file_name, find_config(sections, §ion, &element, section_name, name); if (value != NULL) { - value = strdup(value); - if (!value) { - pr_err("%s: strdup failed\n", __func__); - return -1; - } + value = normalize_value(section_name, name, value); /* if there isn't existent section, add a new section */ if (!section) { -- 1.9.1