All of lore.kernel.org
 help / color / mirror / Atom feed
* Re: Bug#632923: linux-tools-2.6.39: perf tries to read ./config, fails if it is not a perf config file
       [not found] <20110707024506.GA32088@moongate.localnet>
@ 2011-07-07  3:55 ` Ben Hutchings
  2011-08-05 16:58   ` [PATCH] perf: do not look at ./config for configuration Jonathan Nieder
  0 siblings, 1 reply; 4+ messages in thread
From: Ben Hutchings @ 2011-07-07  3:55 UTC (permalink / raw)
  To: Peter Zijlstra, Paul Mackerras, Ingo Molnar, Arnaldo Carvalho de Melo
  Cc: 632923, Christian Ohm, LKML

[-- Attachment #1: Type: text/plain, Size: 804 bytes --]

On Thu, 2011-07-07 at 04:45 +0200, Christian Ohm wrote:
> Package: linux-tools-2.6.39
> Version: 2.6.39-3
> Severity: normal
> 
> Hello,
> 
> When running perf, it looks for a config file in /etc/perfconfig,
> ~/.perfconfig, and ./config (according to strace). If ./config is not a
> perf configuration, it fails (or possibly does unexpected things). Since
> "config" is a quite generic name (I have 175 files with that name on my
> system) it would be nice if this is changed to e.g. ./.perfconfig.

This indeed seems like a misfeature.

Is perf supposed to be invoked in directories dedicated to its use?  If
not, why should it expect a generically-named file to belong to it?

Ben.

-- 
Ben Hutchings
The most exhausting thing in life is being insincere. - Anne Morrow Lindberg

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] perf: do not look at ./config for configuration
  2011-07-07  3:55 ` Bug#632923: linux-tools-2.6.39: perf tries to read ./config, fails if it is not a perf config file Ben Hutchings
@ 2011-08-05 16:58   ` Jonathan Nieder
  2011-08-05 17:34     ` Arnaldo Carvalho de Melo
  2011-08-10  8:26     ` [tip:perf/urgent] perf tools: " tip-bot for Jonathan Nieder
  0 siblings, 2 replies; 4+ messages in thread
From: Jonathan Nieder @ 2011-08-05 16:58 UTC (permalink / raw)
  To: Ben Hutchings
  Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar,
	Arnaldo Carvalho de Melo, 632923, Christian Ohm, LKML

In addition to /etc/perfconfig and $HOME/.perfconfig, perf looks for
configuration in the file ./config, imitating git which looks at
$GIT_DIR/config.  If ./config is not a perf configuration file, it
fails, or worse, treats it as a configuration file and changes
behavior in some unexpected way.

"config" is not an unusual name for a file to be lying around and perf
does not have a private directory dedicated for its own use, so let's
just stop looking for configuration in the cwd.  Callers needing
context-sensitive configuration can use the PERF_CONFIG environment
variable.

Requested-by: Christian Ohm <chr.ohm@gmx.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Thoughts?

 tools/perf/util/config.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index e02d78ca..6c86eca8 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -399,7 +399,6 @@ static int perf_config_global(void)
 int perf_config(config_fn_t fn, void *data)
 {
 	int ret = 0, found = 0;
-	char *repo_config = NULL;
 	const char *home = NULL;
 
 	/* Setting $PERF_CONFIG makes perf read _only_ the given config file. */
@@ -421,12 +420,6 @@ int perf_config(config_fn_t fn, void *data)
 		free(user_config);
 	}
 
-	repo_config = perf_pathdup("config");
-	if (!access(repo_config, R_OK)) {
-		ret += perf_config_from_file(fn, repo_config, data);
-		found += 1;
-	}
-	free(repo_config);
 	if (found == 0)
 		return -1;
 	return ret;
-- 
1.7.6


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] perf: do not look at ./config for configuration
  2011-08-05 16:58   ` [PATCH] perf: do not look at ./config for configuration Jonathan Nieder
@ 2011-08-05 17:34     ` Arnaldo Carvalho de Melo
  2011-08-10  8:26     ` [tip:perf/urgent] perf tools: " tip-bot for Jonathan Nieder
  1 sibling, 0 replies; 4+ messages in thread
From: Arnaldo Carvalho de Melo @ 2011-08-05 17:34 UTC (permalink / raw)
  To: Jonathan Nieder
  Cc: Ben Hutchings, Peter Zijlstra, Paul Mackerras, Ingo Molnar,
	632923, Christian Ohm, LKML

Em Fri, Aug 05, 2011 at 06:58:38PM +0200, Jonathan Nieder escreveu:
> In addition to /etc/perfconfig and $HOME/.perfconfig, perf looks for
> configuration in the file ./config, imitating git which looks at
> $GIT_DIR/config.  If ./config is not a perf configuration file, it
> fails, or worse, treats it as a configuration file and changes
> behavior in some unexpected way.
> 
> "config" is not an unusual name for a file to be lying around and perf
> does not have a private directory dedicated for its own use, so let's
> just stop looking for configuration in the cwd.  Callers needing
> context-sensitive configuration can use the PERF_CONFIG environment
> variable.

Thanks, I'll apply this one.

- Arnaldo

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [tip:perf/urgent] perf tools: do not look at ./config for configuration
  2011-08-05 16:58   ` [PATCH] perf: do not look at ./config for configuration Jonathan Nieder
  2011-08-05 17:34     ` Arnaldo Carvalho de Melo
@ 2011-08-10  8:26     ` tip-bot for Jonathan Nieder
  1 sibling, 0 replies; 4+ messages in thread
From: tip-bot for Jonathan Nieder @ 2011-08-10  8:26 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, linux-kernel, paulus, hpa, mingo, chr.ohm, a.p.zijlstra,
	ben, jrnieder, tglx, mingo

Commit-ID:  aba8d056078e47350d85b06a9cabd5afcc4b72ea
Gitweb:     http://git.kernel.org/tip/aba8d056078e47350d85b06a9cabd5afcc4b72ea
Author:     Jonathan Nieder <jrnieder@gmail.com>
AuthorDate: Fri, 5 Aug 2011 18:58:38 +0200
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 8 Aug 2011 09:46:32 -0300

perf tools: do not look at ./config for configuration

In addition to /etc/perfconfig and $HOME/.perfconfig, perf looks for
configuration in the file ./config, imitating git which looks at
$GIT_DIR/config.  If ./config is not a perf configuration file, it
fails, or worse, treats it as a configuration file and changes behavior
in some unexpected way.

"config" is not an unusual name for a file to be lying around and perf
does not have a private directory dedicated for its own use, so let's
just stop looking for configuration in the cwd.  Callers needing
context-sensitive configuration can use the PERF_CONFIG environment
variable.

Requested-by: Christian Ohm <chr.ohm@gmx.net>
Cc: 632923@bugs.debian.org
Cc: Ben Hutchings <ben@decadent.org.uk>
Cc: Christian Ohm <chr.ohm@gmx.net>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20110805165838.GA7237@elie.gateway.2wire.net
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/config.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index e02d78c..6c86eca 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -399,7 +399,6 @@ static int perf_config_global(void)
 int perf_config(config_fn_t fn, void *data)
 {
 	int ret = 0, found = 0;
-	char *repo_config = NULL;
 	const char *home = NULL;
 
 	/* Setting $PERF_CONFIG makes perf read _only_ the given config file. */
@@ -421,12 +420,6 @@ int perf_config(config_fn_t fn, void *data)
 		free(user_config);
 	}
 
-	repo_config = perf_pathdup("config");
-	if (!access(repo_config, R_OK)) {
-		ret += perf_config_from_file(fn, repo_config, data);
-		found += 1;
-	}
-	free(repo_config);
 	if (found == 0)
 		return -1;
 	return ret;

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2011-08-10  8:27 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20110707024506.GA32088@moongate.localnet>
2011-07-07  3:55 ` Bug#632923: linux-tools-2.6.39: perf tries to read ./config, fails if it is not a perf config file Ben Hutchings
2011-08-05 16:58   ` [PATCH] perf: do not look at ./config for configuration Jonathan Nieder
2011-08-05 17:34     ` Arnaldo Carvalho de Melo
2011-08-10  8:26     ` [tip:perf/urgent] perf tools: " tip-bot for Jonathan Nieder

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.