2016-03-27 17:22:27

by Taeung Song

Subject: [PATCH 1/3] perf config: Remove duplicated the code calling set_buildid_dir

Cc: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Signed-off-by: Taeung Song <[email protected]>
---
tools/perf/perf.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index aaee0a7..7b2df2b 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -549,6 +549,7 @@ int main(int argc, const char **argv)
srandom(time(NULL));

perf_config(perf_default_config, NULL);
+ set_buildid_dir(NULL);

/* get debugfs/tracefs mount point from /proc/mounts */
tracing_path_mount();
@@ -572,7 +573,6 @@ int main(int argc, const char **argv)
}
if (!prefixcmp(cmd, "trace")) {
#ifdef HAVE_LIBAUDIT_SUPPORT
- set_buildid_dir(NULL);
setup_path();
argv[0] = "trace";
return cmd_trace(argc, argv, NULL);
@@ -587,7 +587,6 @@ int main(int argc, const char **argv)
argc--;
handle_options(&argv, &argc, NULL);
commit_pager_choice();
- set_buildid_dir(NULL);

if (argc > 0) {
if (!prefixcmp(argv[0], "--"))
--
2.5.0

2016-03-27 17:22:30

by Taeung Song

Subject: [PATCH 2/3] perf config: Rework buildid_dir_command_config to perf_buildid_config

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().

Cc: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Wang Nan <[email protected]>
Signed-off-by: Taeung Song <[email protected]>
---
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 4e72763..2dd78f4 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.0

2016-03-27 17:22:35

by Taeung Song

Subject: [PATCH 3/3] perf config: Rename 'v' to 'home' at set_buildid_dir

Change a variable name 'v' to
'home' to be more readable name.

Cc: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Signed-off-by: Taeung Song <[email protected]>
---
tools/perf/util/config.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 2dd78f4..5c20d78 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -540,10 +540,11 @@ void set_buildid_dir(const char *dir)

/* default to $HOME/.debug */
if (buildid_dir[0] == '\0') {
- char *v = getenv("HOME");
- if (v) {
+ char *home = getenv("HOME");
+
+ if (home) {
snprintf(buildid_dir, MAXPATHLEN-1, "%s/%s",
- v, DEBUG_CACHE_DIR);
+ home, DEBUG_CACHE_DIR);
} else {
strncpy(buildid_dir, DEBUG_CACHE_DIR, MAXPATHLEN-1);
}
--
2.5.0

2016-03-28 19:52:50

by Jiri Olsa

Subject: Re: [PATCH 1/3] perf config: Remove duplicated the code calling set_buildid_dir

On Mon, Mar 28, 2016 at 02:22:18AM +0900, Taeung Song wrote:
> Cc: Jiri Olsa <[email protected]>
> Cc: Namhyung Kim <[email protected]>
> Signed-off-by: Taeung Song <[email protected]>

for the patchset:

Acked-by: Jiri Olsa <[email protected]>

thanks,
jirka

> ---
> tools/perf/perf.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/tools/perf/perf.c b/tools/perf/perf.c
> index aaee0a7..7b2df2b 100644
> --- a/tools/perf/perf.c
> +++ b/tools/perf/perf.c
> @@ -549,6 +549,7 @@ int main(int argc, const char **argv)
> srandom(time(NULL));
>
> perf_config(perf_default_config, NULL);
> + set_buildid_dir(NULL);
>
> /* get debugfs/tracefs mount point from /proc/mounts */
> tracing_path_mount();
> @@ -572,7 +573,6 @@ int main(int argc, const char **argv)
> }
> if (!prefixcmp(cmd, "trace")) {
> #ifdef HAVE_LIBAUDIT_SUPPORT
> - set_buildid_dir(NULL);
> setup_path();
> argv[0] = "trace";
> return cmd_trace(argc, argv, NULL);
> @@ -587,7 +587,6 @@ int main(int argc, const char **argv)
> argc--;
> handle_options(&argv, &argc, NULL);
> commit_pager_choice();
> - set_buildid_dir(NULL);
>
> if (argc > 0) {
> if (!prefixcmp(argv[0], "--"))
> --
> 2.5.0
>

2016-03-28 21:00:03

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH 1/3] perf config: Remove duplicated the code calling set_buildid_dir

Em Mon, Mar 28, 2016 at 09:52:42PM +0200, Jiri Olsa escreveu:
> On Mon, Mar 28, 2016 at 02:22:18AM +0900, Taeung Song wrote:
> > Cc: Jiri Olsa <[email protected]>
> > Cc: Namhyung Kim <[email protected]>
> > Signed-off-by: Taeung Song <[email protected]>
>
> for the patchset:
>
> Acked-by: Jiri Olsa <[email protected]>

Thanks, applied.

2016-03-28 23:58:27

by Taeung Song

Subject: Re: [PATCH 1/3] perf config: Remove duplicated the code calling set_buildid_dir

Hi, jirka and Arnaldo

On 03/29/2016 05:59 AM, Arnaldo Carvalho de Melo wrote:
> Em Mon, Mar 28, 2016 at 09:52:42PM +0200, Jiri Olsa escreveu:
>> On Mon, Mar 28, 2016 at 02:22:18AM +0900, Taeung Song wrote:
>>> Cc: Jiri Olsa <[email protected]>
>>> Cc: Namhyung Kim <[email protected]>
>>> Signed-off-by: Taeung Song <[email protected]>
>>
>> for the patchset:
>>
>> Acked-by: Jiri Olsa <[email protected]>
>
> Thanks, applied.

Thank you !! :-)

Taeung

2016-03-31 06:53:53

by tip-bot for Vasyl Gomonovych

Subject: [tip:perf/core] perf config: Remove duplicated set_buildid_dir calls

Commit-ID: 58cb9d650be45100bf53ddf9e00351391de3d735
Gitweb: http://git.kernel.org/tip/58cb9d650be45100bf53ddf9e00351391de3d735
Author: Taeung Song <[email protected]>
AuthorDate: Mon, 28 Mar 2016 02:22:18 +0900
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 30 Mar 2016 11:14:08 -0300

perf config: Remove duplicated set_buildid_dir calls

Signed-off-by: Taeung Song <[email protected]>
Acked-by: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/perf.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index aaee0a7..7b2df2b 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -549,6 +549,7 @@ int main(int argc, const char **argv)
srandom(time(NULL));

perf_config(perf_default_config, NULL);
+ set_buildid_dir(NULL);

/* get debugfs/tracefs mount point from /proc/mounts */
tracing_path_mount();
@@ -572,7 +573,6 @@ int main(int argc, const char **argv)
}
if (!prefixcmp(cmd, "trace")) {
#ifdef HAVE_LIBAUDIT_SUPPORT
- set_buildid_dir(NULL);
setup_path();
argv[0] = "trace";
return cmd_trace(argc, argv, NULL);
@@ -587,7 +587,6 @@ int main(int argc, const char **argv)
argc--;
handle_options(&argv, &argc, NULL);
commit_pager_choice();
- set_buildid_dir(NULL);

if (argc > 0) {
if (!prefixcmp(argv[0], "--"))

2016-03-31 06:54:45

by tip-bot for Vasyl Gomonovych

Subject: [tip:perf/core] perf config: Rename 'v' to 'home' in set_buildid_dir()

Commit-ID: 37194f443a5a7157866ba68b04827e111100167b
Gitweb: http://git.kernel.org/tip/37194f443a5a7157866ba68b04827e111100167b
Author: Taeung Song <[email protected]>
AuthorDate: Mon, 28 Mar 2016 02:22:20 +0900
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 30 Mar 2016 11:14:09 -0300

perf config: Rename 'v' to 'home' in set_buildid_dir()

Change the variable name 'v' to 'home' to make it more readable.

Signed-off-by: Taeung Song <[email protected]>
Acked-by: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/util/config.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 2dd78f4..5c20d78 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -540,10 +540,11 @@ void set_buildid_dir(const char *dir)

/* default to $HOME/.debug */
if (buildid_dir[0] == '\0') {
- char *v = getenv("HOME");
- if (v) {
+ char *home = getenv("HOME");
+
+ if (home) {
snprintf(buildid_dir, MAXPATHLEN-1, "%s/%s",
- v, DEBUG_CACHE_DIR);
+ home, DEBUG_CACHE_DIR);
} else {
strncpy(buildid_dir, DEBUG_CACHE_DIR, MAXPATHLEN-1);
}

2016-03-31 06:55:19

by tip-bot for Vasyl Gomonovych

Subject: [tip:perf/core] perf config: Rework buildid_dir_command_config to perf_buildid_config

Commit-ID: 9cb5987c822714352e3eb46806fc260b3cb4ff0d
Gitweb: http://git.kernel.org/tip/9cb5987c822714352e3eb46806fc260b3cb4ff0d
Author: Taeung Song <[email protected]>
AuthorDate: Mon, 28 Mar 2016 02:22:19 +0900
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 30 Mar 2016 11:14:09 -0300

perf config: Rework buildid_dir_command_config to perf_buildid_config

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 <[email protected]>
Acked-by: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Wang Nan <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
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 4e72763..2dd78f4 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");