mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Taeung Song <treeze.taeung@gmail.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: linux-kernel@vger.kernel.org, jolsa@redhat.com,
	namhyung@kernel.org, Ingo Molnar <mingo@redhat.com>,
	Taeung Song <treeze.taeung@gmail.com>
Subject: [PATCH v5 5/6] perf config: Add 'set' feature
Date: Tue, 18 Aug 2015 00:19:24 +0900	[thread overview]
Message-ID: <1439824765-10564-6-git-send-email-treeze.taeung@gmail.com> (raw)
In-Reply-To: <1439824765-10564-1-git-send-email-treeze.taeung@gmail.com>

This patch consists of functions
which can set specific config variables.
For the syntax examples,

   perf config [options] [section.name[=value] ...]

   set specific config variables
   # perf config report.queue-size=100M report.children=true

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
 tools/perf/Documentation/perf-config.txt |  2 +-
 tools/perf/builtin-config.c              | 55 +++++++++++++++++++++++++++++---
 tools/perf/util/cache.h                  |  3 +-
 tools/perf/util/config.c                 | 27 ++++++++++++++++
 4 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt
index 691d52b..9c95af8 100644
--- a/tools/perf/Documentation/perf-config.txt
+++ b/tools/perf/Documentation/perf-config.txt
@@ -8,7 +8,7 @@ perf-config - Get and set variables in a configuration file.
 SYNOPSIS
 --------
 [verse]
-'perf config' [<file-option>] [section.name ...]
+'perf config' [<file-option>] [section.name[=value] ...]
 or
 'perf config' [<file-option>] -l | --list
 or
diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
index 0f2193a..d5cc3e8 100644
--- a/tools/perf/builtin-config.c
+++ b/tools/perf/builtin-config.c
@@ -17,7 +17,7 @@ static bool use_system_config, use_user_config;
 static const char *config_file_name;
 
 static const char * const config_usage[] = {
-	"perf config [options] [section.name ...]",
+	"perf config [options] [section.name[=value] ...]",
 	NULL
 };
 
@@ -412,7 +412,8 @@ static void find_config(struct config_section **section_node,
 		*element_node = NULL;
 }
 
-static int show_spec_config(const char *section_name, const char *name)
+static int show_spec_config(const char *section_name, const char *name,
+			    char *value __maybe_unused)
 {
 	int i;
 	struct config_section *section_node = NULL;
@@ -488,6 +489,34 @@ static char *normalize_value(const char *section_name, const char *name, const c
 	return normalized;
 }
 
+static int set_config(const char *section_name, const char *name, char *value)
+{
+	struct config_section *section_node = NULL;
+	struct config_element *element_node = NULL;
+
+	find_config(&section_node, &element_node, section_name, name);
+	if (value != NULL) {
+		value = normalize_value(section_name, name, value);
+
+		/* if there isn't existent section, add a new section */
+		if (!section_node) {
+			section_node = init_section(section_name);
+			if (!section_node)
+				return -1;
+			list_add_tail(&section_node->list, &sections);
+		}
+		/* if nothing to replace, add a new element which contains key-value pair. */
+		if (!element_node) {
+			add_element(&section_node->element_head, name, value);
+		} else {
+			free(element_node->value);
+			element_node->value = value;
+		}
+	}
+
+	return perf_configset_write_in_full(config_file_name);
+}
+
 static int collect_current_config(const char *var, const char *value,
 			  void *cb __maybe_unused)
 {
@@ -557,7 +586,7 @@ static int show_all_config(void)
 	return 0;
 }
 
-static int perf_configset_with_option(configset_fn_t fn, const char *var)
+static int perf_configset_with_option(configset_fn_t fn, const char *var, char *value)
 {
 	char *section_name;
 	char *name;
@@ -585,8 +614,18 @@ static int perf_configset_with_option(configset_fn_t fn, const char *var)
 	section_name = strsep(&key, ".");
 	name = strsep(&key, ".");
 	free(key);
+	if (!value) {
+		/* do nothing */
+	} else if (!strcmp(value, "=")) {
+		pr_err("The config variable does not contain a value: %s.%s\n",
+		       section_name, name);
+		return -1;
+	} else {
+		value++;
+		name = strsep(&name, "=");
+	}
 
-	return fn(section_name, name);
+	return fn(section_name, name, value);
 
 	pr_err("invalid key: %s\n", var);
 	return -1;
@@ -625,7 +664,13 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused)
 	default:
 		if (argc) {
 			for (i = 0; argv[i]; i++) {
-				ret = perf_configset_with_option(show_spec_config, argv[i]);
+				char *value = strchr(argv[i], '=');
+				if (value == NULL)
+					ret = perf_configset_with_option(show_spec_config,
+									 argv[i], value);
+				else
+					ret = perf_configset_with_option(set_config,
+									 argv[i], value);
 				if (ret < 0)
 					break;
 			}
diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
index 6fe734c..0b68c89 100644
--- a/tools/perf/util/cache.h
+++ b/tools/perf/util/cache.h
@@ -34,7 +34,8 @@ struct config_section {
 
 struct list_head sections;
 
-typedef int (*configset_fn_t)(const char *, const char *);
+extern int perf_configset_write_in_full(const char *file_name);
+typedef int (*configset_fn_t)(const char *, const char *, char*);
 typedef int (*config_fn_t)(const char *, const char *, void *);
 extern int perf_default_config(const char *, const char *, void *);
 extern int perf_config(config_fn_t fn, void *);
diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 23fa8c5..4c13991 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -506,6 +506,33 @@ out:
 	return ret;
 }
 
+int perf_configset_write_in_full(const char *file_name)
+{
+	struct config_section *section_node;
+	struct config_element *element_node;
+	const char *first_line = "# this file is auto-generated.";
+	FILE *fp = fopen(file_name, "w");
+
+	if (!fp) {
+		pr_err("Error: %s: Can't open this file\n", file_name);
+		return -1;
+	}
+
+	fprintf(fp, "%s\n", first_line);
+	/* overwrite configvariables */
+	list_for_each_entry(section_node, &sections, list) {
+		fprintf(fp, "[%s]\n", section_node->name);
+		list_for_each_entry(element_node, &section_node->element_head, list) {
+			if (element_node->value)
+				fprintf(fp, "\t%s = %s\n",
+					element_node->name, element_node->value);
+		}
+	}
+	fclose(fp);
+
+	return 0;
+}
+
 /*
  * Call this to report error for your variable that should not
  * get a boolean value (i.e. "[my] var" means "true").
-- 
1.9.1


  parent reply	other threads:[~2015-08-17 17:29 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-17 15:19 [PATCH v5 0/6] perf tools: Add 'perf-config' command Taeung Song
2015-08-17 15:19 ` [PATCH v5 1/6] " Taeung Song
2015-08-17 15:19 ` [PATCH v5 2/6] perf config: Add '--system' and '--user' options to select which config file is used Taeung Song
2015-08-17 15:19 ` [PATCH v5 3/6] perf config: Add a option 'list-all' to perf-config Taeung Song
2015-08-17 15:19 ` [PATCH v5 4/6] perf config: Add 'get' functionality Taeung Song
2015-08-17 15:19 ` Taeung Song [this message]
2015-08-17 15:19 ` [PATCH v5 6/6] perf config: Add a option 'remove' to perf-config Taeung Song

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1439824765-10564-6-git-send-email-treeze.taeung@gmail.com \
    --to=treeze.taeung@gmail.com \
    --cc=acme@kernel.org \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=namhyung@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®