From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752949AbcBJRwZ (ORCPT ); Wed, 10 Feb 2016 12:52:25 -0500 Received: from mail-pa0-f67.google.com ([209.85.220.67]:34703 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753298AbcBJRvt (ORCPT ); Wed, 10 Feb 2016 12:51:49 -0500 From: Taeung Song To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Namhyung Kim , Ingo Molnar , Taeung Song Subject: [PATCH v15 8/9] perf config: normalize a value depending on default type of it Date: Thu, 11 Feb 2016 02:51:24 +0900 Message-Id: <1455126685-32367-9-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455126685-32367-1-git-send-email-treeze.taeung@gmail.com> References: <1455126685-32367-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 Cc: Namhyung Kim Cc: Jiri Olsa Signed-off-by: Taeung Song --- tools/perf/builtin-config.c | 54 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index ad50cf5..92ff842 100644 --- a/tools/perf/builtin-config.c +++ b/tools/perf/builtin-config.c @@ -444,6 +444,54 @@ 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 *endptr; + char key[BUFSIZ]; + char *normalized; + + scnprintf(key, sizeof(key), "%s.%s", section_name, name); + for (i = 0; default_configs[i].type != CONFIG_END; i++) { + struct config_item *config = &default_configs[i]; + + if (!strcmp(config->section, section_name) && + !strcmp(config->name, name)) { + if (config->type == CONFIG_TYPE_BOOL) + ret = asprintf(&normalized, "%s", + perf_config_bool(key, value) ? "true" : "false"); + else if (config->type == CONFIG_TYPE_INT || + config->type == CONFIG_TYPE_LONG) + ret = asprintf(&normalized, "%d", + perf_config_int(key, value)); + else if (config->type == CONFIG_TYPE_U64) + ret = asprintf(&normalized, "%"PRId64, + perf_config_u64(key, value)); + else if (config->type == CONFIG_TYPE_FLOAT) + ret = asprintf(&normalized, "%f", + strtof(value, &endptr)); + else if (config->type == CONFIG_TYPE_DOUBLE) + ret = asprintf(&normalized, "%f", + strtod(value, &endptr)); + else + ret = asprintf(&normalized, "%s", 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) { @@ -452,11 +500,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) { -- 2.5.0