Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1409286 > unrolled thread

[PATCH v3 4/7] perf config: Reimplement perf_config() using perf_config_set__iter()

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH v3 4/7] perf config: Reimplement perf_config() using perf_config_set__iter() Taeung Song <treeze.taeung@gmail.com> - 2016-05-30 18:50 +0200
    Re: [PATCH v3 4/7] perf config: Reimplement perf_config() using  perf_config_set__iter() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-30 21:40 +0200
      Re: [PATCH v3 4/7] perf config: Reimplement perf_config() using  perf_config_set__iter() Taeung Song <treeze.taeung@gmail.com> - 2016-05-31 00:30 +0200

#1409286 — [PATCH v3 4/7] perf config: Reimplement perf_config() using perf_config_set__iter()

Everytime perf_config() is called, perf_config() always read config files.
(i.e. user config '~/.perfconfig' and system config '$(sysconfdir)/perfconfig')

But we need to use the config set that already contains all config
key-value pairs to avoid this repetitive work reading the config files
in perf_config(). (the config set mean a global variable 'config_set')

In other words, if new perf_config() is called,
only first time 'config_set' is initialized collecting all configs
from the config files and it work with perf_config_set__iter().
And free the config set after sub-command work at run_builtin().

If we do, 'config_set' can be reused wherever using perf_config()
and a feature of old perf_config() is the same as new perf_config() work
without the repetitive work that read the config files.

Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Wang Nan <wangnan0@huawei.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
 tools/perf/perf.c        |  1 +
 tools/perf/util/cache.h  |  1 +
 tools/perf/util/config.c | 97 ++++++++++++++++++++++++------------------------
 3 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 15982ce..32e54d9 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -391,6 +391,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 
 	perf_env__set_cmdline(&perf_env, argc, argv);
 	status = p->fn(argc, argv, prefix);
+	perf_config_set__delete();
 	exit_browser(status);
 	perf_env__exit(&perf_env);
 	bpf__clear();
diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
index 0d814bb..54bbd55 100644
--- a/tools/perf/util/cache.h
+++ b/tools/perf/util/cache.h
@@ -7,6 +7,7 @@
 #include <subcmd/pager.h>
 #include "../perf.h"
 #include "../ui/ui.h"
+#include "config.h"
 
 #include <linux/string.h>
 
diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 68def9a..abfe1b2 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -478,54 +478,6 @@ static int perf_config_global(void)
 	return !perf_env_bool("PERF_CONFIG_NOGLOBAL", 0);
 }
 
-int perf_config(config_fn_t fn, void *data)
-{
-	int ret = 0, found = 0;
-	const char *home = NULL;
-
-	/* Setting $PERF_CONFIG makes perf read _only_ the given config file. */
-	if (config_exclusive_filename)
-		return perf_config_from_file(fn, config_exclusive_filename, data);
-	if (perf_config_system() && !access(perf_etc_perfconfig(), R_OK)) {
-		ret += perf_config_from_file(fn, perf_etc_perfconfig(),
-					    data);
-		found += 1;
-	}
-
-	home = getenv("HOME");
-	if (perf_config_global() && home) {
-		char *user_config = strdup(mkpath("%s/.perfconfig", home));
-		struct stat st;
-
-		if (user_config == NULL) {
-			warning("Not enough memory to process %s/.perfconfig, "
-				"ignoring it.", home);
-			goto out;
-		}
-
-		if (stat(user_config, &st) < 0)
-			goto out_free;
-
-		if (st.st_uid && (st.st_uid != geteuid())) {
-			warning("File %s not owned by current user or root, "
-				"ignoring it.", user_config);
-			goto out_free;
-		}
-
-		if (!st.st_size)
-			goto out_free;
-
-		ret += perf_config_from_file(fn, user_config, data);
-		found += 1;
-out_free:
-		free(user_config);
-	}
-out:
-	if (found == 0)
-		return -1;
-	return ret;
-}
-
 static struct perf_config_section *find_section(struct list_head *sections,
 						const char *section_name)
 {
@@ -706,6 +658,55 @@ struct perf_config_set *perf_config_set__new(void)
 	return set;
 }
 
+static int perf_config_set__check(void)
+{
+	if (config_set != NULL)
+		return 0;
+
+	config_set = perf_config_set__new();
+	if (!config_set)
+		return -1;
+
+	return 0;
+}
+
+static int perf_config_set__iter(struct perf_config_set *set, config_fn_t fn, void *data)
+{
+	struct perf_config_section *section;
+	struct perf_config_item *item;
+	struct list_head *sections;
+	char key[BUFSIZ];
+
+	if (set == NULL)
+		return -1;
+
+	sections = &set->sections;
+	if (list_empty(sections))
+		return -1;
+
+	list_for_each_entry(section, sections, node) {
+		list_for_each_entry(item, &section->items, node) {
+			char *value = item->value;
+
+			if (value) {
+				scnprintf(key, sizeof(key), "%s.%s",
+					  section->name, item->name);
+				if (fn(key, value, data) < 0)
+					return -1;
+			}
+		}
+	}
+
+	return 0;
+}
+
+int perf_config(config_fn_t fn, void *data)
+{
+	if (perf_config_set__check() < 0)
+		return -1;
+	return perf_config_set__iter(config_set, fn, data);
+}
+
 static void perf_config_item__delete(struct perf_config_item *item)
 {
 	zfree(&item->name);
-- 
2.5.0

[toc] | [next] | [standalone]

#1409352 — Re: [PATCH v3 4/7] perf config: Reimplement perf_config() using perf_config_set__iter()

Em Tue, May 31, 2016 at 01:44:08AM +0900, Taeung Song escreveu:
> +static int perf_config_set__iter(struct perf_config_set *set, config_fn_t fn, void *data)
> +{
> +	struct perf_config_section *section;
> +	struct perf_config_item *item;
> +	struct list_head *sections;
> +	char key[BUFSIZ];
> +
> +	if (set == NULL)
> +		return -1;
<SNIP>
> +	return 0;
> +}
> +int perf_config(config_fn_t fn, void *data)
> +{
> +	if (perf_config_set__check() < 0)
> +		return -1;
> +	return perf_config_set__iter(config_set, fn, data);
> +}

"check" looks too vague, this is equivalent, no?

int perf_config(config_fn_t, void *data)
{
	if (config_set == NULL)
		config_set = perf_config_set__new();
	
	return perf_config_set__iter(config_set, fn, data);
}

- Arnaldo

[toc] | [prev] | [next] | [standalone]

#1409708 — Re: [PATCH v3 4/7] perf config: Reimplement perf_config() using perf_config_set__iter()

On 05/31/2016 04:32 AM, Arnaldo Carvalho de Melo wrote:
> Em Tue, May 31, 2016 at 01:44:08AM +0900, Taeung Song escreveu:
>> +static int perf_config_set__iter(struct perf_config_set *set, config_fn_t fn, void *data)
>> +{
>> +	struct perf_config_section *section;
>> +	struct perf_config_item *item;
>> +	struct list_head *sections;
>> +	char key[BUFSIZ];
>> +
>> +	if (set == NULL)
>> +		return -1;
> <SNIP>
>> +	return 0;
>> +}
>> +int perf_config(config_fn_t fn, void *data)
>> +{
>> +	if (perf_config_set__check() < 0)
>> +		return -1;
>> +	return perf_config_set__iter(config_set, fn, data);
>> +}
>
> "check" looks too vague, this is equivalent, no?
>
> int perf_config(config_fn_t, void *data)
> {
> 	if (config_set == NULL)
> 		config_set = perf_config_set__new();
> 	
> 	return perf_config_set__iter(config_set, fn, data);
> }
>

I understood it! I thought __check() function is needed for readability.
But I'll remove __check() because it would seem that the function isn't 
needed as you said.

Thanks,
Taeung

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web