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

Groups > linux.kernel > #1366810

[PATCH 06/11] perf config: Rework buildid_dir_command_config to perf_buildid_config

Show all headers | View raw

From: Taeung Song <treeze.taeung@gmail.com>

To avoid repeated calling perf_config() remove
buildid_dir_command_config() and add new perf_buildid_config into
perf_default_config.

Because perf_config() is already called with perf_default_config at
main().

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1459099340-16911-2-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/config.c | 50 +++++++++++++++++-------------------------------
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 4e727635476e..2dd78f4c97a0 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -377,6 +377,21 @@ const char *perf_config_dirname(const char *name, const char *value)
 	return value;
 }
 
+static int perf_buildid_config(const char *var, const char *value)
+{
+	/* same dir for all commands */
+	if (!strcmp(var, "buildid.dir")) {
+		const char *dirname = perf_config_dirname(var, value);
+
+		if (!dirname)
+			return -1;
+		strncpy(buildid_dir, dirname, MAXPATHLEN-1);
+		buildid_dir[MAXPATHLEN-1] = '\0';
+	}
+
+	return 0;
+}
+
 static int perf_default_core_config(const char *var __maybe_unused,
 				    const char *value __maybe_unused)
 {
@@ -412,6 +427,9 @@ int perf_default_config(const char *var, const char *value,
 	if (!prefixcmp(var, "llvm."))
 		return perf_llvm_config(var, value);
 
+	if (!prefixcmp(var, "buildid."))
+		return perf_buildid_config(var, value);
+
 	/* Add other config variables here. */
 	return 0;
 }
@@ -515,43 +533,11 @@ int config_error_nonbool(const char *var)
 	return error("Missing value for '%s'", var);
 }
 
-struct buildid_dir_config {
-	char *dir;
-};
-
-static int buildid_dir_command_config(const char *var, const char *value,
-				      void *data)
-{
-	struct buildid_dir_config *c = data;
-	const char *v;
-
-	/* same dir for all commands */
-	if (!strcmp(var, "buildid.dir")) {
-		v = perf_config_dirname(var, value);
-		if (!v)
-			return -1;
-		strncpy(c->dir, v, MAXPATHLEN-1);
-		c->dir[MAXPATHLEN-1] = '\0';
-	}
-	return 0;
-}
-
-static void check_buildid_dir_config(void)
-{
-	struct buildid_dir_config c;
-	c.dir = buildid_dir;
-	perf_config(buildid_dir_command_config, &c);
-}
-
 void set_buildid_dir(const char *dir)
 {
 	if (dir)
 		scnprintf(buildid_dir, MAXPATHLEN-1, "%s", dir);
 
-	/* try config file */
-	if (buildid_dir[0] == '\0')
-		check_buildid_dir_config();
-
 	/* default to $HOME/.debug */
 	if (buildid_dir[0] == '\0') {
 		char *v = getenv("HOME");
-- 
2.5.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 00/11] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-03-30 01:50 +0200
  [PATCH 09/11] perf tools: Add support for skipping itrace instructions Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-03-30 01:50 +0200
  [PATCH 08/11] perf script perl: Perl scripts now get a backtrace, like the python ones Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-03-30 01:50 +0200
  [PATCH 01/11] perf mem: Add -U/-K (--all-user/--all-kernel) options Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-03-30 01:50 +0200
  [PATCH 05/11] perf config: Remove duplicated set_buildid_dir calls Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-03-30 01:50 +0200
  [PATCH 11/11] perf script: Add support for printing assembler Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-03-30 01:50 +0200
  [PATCH 02/11] perf tools: Make hists__collapse_insert_entry static Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-03-30 01:50 +0200
  [PATCH 07/11] perf config: Rename 'v' to 'home' in set_buildid_dir() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-03-30 01:50 +0200
  [PATCH 03/11] perf tools: Make -f/--force option documentation consistent across tools Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-03-30 01:50 +0200
  [PATCH 10/11] perf tools: Add probing for udev86 library Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-03-30 01:50 +0200
    Re: [PATCH 10/11] perf tools: Add probing for udev86 library Ingo Molnar <mingo@kernel.org> - 2016-03-30 12:50 +0200
      Re: [PATCH 10/11] perf tools: Add probing for udev86 library Arnaldo Carvalho de Melo <acme@redhat.com> - 2016-03-30 15:40 +0200
        Re: [PATCH 10/11] perf tools: Add probing for udev86 library Ingo Molnar <mingo@kernel.org> - 2016-03-30 16:00 +0200
          Re: [PATCH 10/11] perf tools: Add probing for udev86 library Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-03-30 16:20 +0200
            Re: [PATCH 10/11] perf tools: Add probing for udev86 library Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-03-30 16:50 +0200
              Re: [PATCH 10/11] perf tools: Add probing for udev86 library Ingo Molnar <mingo@kernel.org> - 2016-03-31 08:40 +0200
          Re: [PATCH 10/11] perf tools: Add probing for udev86 library Andi Kleen <ak@linux.intel.com> - 2016-03-30 17:10 +0200
            Re: [PATCH 10/11] perf tools: Add probing for udev86 library Ingo Molnar <mingo@kernel.org> - 2016-03-31 09:00 +0200
      Re: [PATCH 10/11] perf tools: Add probing for udev86 library Andi Kleen <ak@linux.intel.com> - 2016-03-30 16:50 +0200
  [PATCH 06/11] perf config: Rework buildid_dir_command_config to perf_buildid_config Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-03-30 01:50 +0200
  [PATCH 04/11] perf tests: Add test to check for event times Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-03-30 01:50 +0200

csiph-web