[PATCH 0/2] perf trace: a couple small fixes

[PATCH 0/2] perf trace: a couple small fixes

[Tom Zanussi]

Tom Zanussi (2):
  perf trace/scripting: remove extraneous header read
  perf trace: don't use pager if scripting

 tools/perf/builtin-trace.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

[PATCH 1/2] perf trace/scripting: remove extraneous header read

[Tom Zanussi]

perf_header__read() is already done in perf_session__open(), so remove
it from the script gen case.

Signed-off-by: Tom Zanussi <tzanussi@gmail.com>
---
 tools/perf/builtin-trace.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 5db687f..b8153db 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -608,7 +608,6 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
 			return -1;
 		}
 
-		perf_header__read(&session->header, input);
 		err = scripting_ops->generate_script("perf-trace");
 		goto out;
 	}
-- 
1.6.4.GIT

[PATCH 2/2] perf trace: don't use pager if scripting

[Tom Zanussi]

It's useful for paging through raw traces, but just gets in the way
when scripting.

Signed-off-by: Tom Zanussi <tzanussi@gmail.com>
---
 tools/perf/builtin-trace.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index b8153db..407041d 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -573,7 +573,8 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
 
 	if (symbol__init() < 0)
 		return -1;
-	setup_pager();
+	if (!script_name)
+		setup_pager();
 
 	session = perf_session__new(input_name, O_RDONLY, 0);
 	if (session == NULL)
-- 
1.6.4.GIT

[tip:perf/pebs] perf trace/scripting: Remove extraneous header read

[tip-bot for Tom Zanussi]

Commit-ID:  10c95f4f41889daaa8130e0bd12209825dbe8d39
Gitweb:     http://git.kernel.org/tip/10c95f4f41889daaa8130e0bd12209825dbe8d39
Author:     Tom Zanussi <tzanussi@gmail.com>
AuthorDate: Wed, 3 Mar 2010 01:04:32 -0600
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Thu, 4 Mar 2010 12:19:54 +0100

perf trace/scripting: Remove extraneous header read

perf_header__read() is already done in perf_session__open(), so
remove it from the script gen case.

Signed-off-by: Tom Zanussi <tzanussi@gmail.com>
Cc: fweisbec@gmail.com
Cc: rostedt@goodmis.org
LKML-Reference: <1267599873-8193-2-git-send-email-tzanussi@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 tools/perf/builtin-trace.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 5db687f..b8153db 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -608,7 +608,6 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
 			return -1;
 		}
 
-		perf_header__read(&session->header, input);
 		err = scripting_ops->generate_script("perf-trace");
 		goto out;
 	}

[tip:perf/pebs] perf trace: Don't use pager if scripting

[tip-bot for Tom Zanussi]

Commit-ID:  cf4fee50282312528e1f8adf73b1831d1d6ae389
Gitweb:     http://git.kernel.org/tip/cf4fee50282312528e1f8adf73b1831d1d6ae389
Author:     Tom Zanussi <tzanussi@gmail.com>
AuthorDate: Wed, 3 Mar 2010 01:04:33 -0600
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Thu, 4 Mar 2010 12:19:55 +0100

perf trace: Don't use pager if scripting

It's useful for paging through raw traces, but just gets in the
way when scripting.

Signed-off-by: Tom Zanussi <tzanussi@gmail.com>
Cc: fweisbec@gmail.com
Cc: rostedt@goodmis.org
LKML-Reference: <1267599873-8193-3-git-send-email-tzanussi@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 tools/perf/builtin-trace.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index b8153db..407041d 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -573,7 +573,8 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
 
 	if (symbol__init() < 0)
 		return -1;
-	setup_pager();
+	if (!script_name)
+		setup_pager();
 
 	session = perf_session__new(input_name, O_RDONLY, 0);
 	if (session == NULL)