[GIT PULL 0/2] perf/core fixes

[GIT PULL 0/2] perf/core fixes

[Arnaldo Carvalho de Melo]

Hi Ingo,

        Please pull from:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/core

	Now there are 13 outstanding patches in this branch.

Regards,

- Arnaldo

Corey Ashford (1):
  perf tools: fix event parsing of comma-separated tracepoint events

Don Zickus (1):
  perf packaging: add memcpy to perf MANIFEST

 tools/perf/MANIFEST            |    1 +
 tools/perf/util/parse-events.c |   12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

[GIT PULL 0/2] perf/core fixes

[Arnaldo Carvalho de Melo]

Hi Ingo,

        Please consider pulling from:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/core

Regards,

- Arnaldo

Arnaldo Carvalho de Melo (2):
  perf probe: Fix error propagation leading to segfault
  perf evsel: Fix inverted test for fixing up attr.inherit flag

 tools/perf/util/evsel.c        |   15 +++++++++++++--
 tools/perf/util/probe-event.c  |    5 ++++-
 tools/perf/util/probe-finder.c |    4 +++-
 3 files changed, 20 insertions(+), 4 deletions(-)

Re: [GIT PULL 0/2] perf/core fixes

[Ingo Molnar]

* Arnaldo Carvalho de Melo <acme@infradead.org> wrote:

> Hi Ingo,
> 
>         Please consider pulling from:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/core
> 
> Regards,
> 
> - Arnaldo
> 
> Arnaldo Carvalho de Melo (2):
>   perf probe: Fix error propagation leading to segfault
>   perf evsel: Fix inverted test for fixing up attr.inherit flag
> 
>  tools/perf/util/evsel.c        |   15 +++++++++++++--
>  tools/perf/util/probe-event.c  |    5 ++++-
>  tools/perf/util/probe-finder.c |    4 +++-
>  3 files changed, 20 insertions(+), 4 deletions(-)

Pulled, thanks a lot Arnaldo!

Thanks,

	Ingo

[GIT PULL 0/2] perf/core fixes

[Arnaldo Carvalho de Melo]

Hi Ingo,

        Please consider pulling from:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/core

	Mike, this fixes a segfault when navigating in the tail of the active
list in perf top --tui.

Regards,

- Arnaldo

Arnaldo Carvalho de Melo (1):
  perf top browser: Adjust the browser indexes when refreshing

Marcin Slusarz (1):
  perf lock: Document valid sort keys

 tools/perf/Documentation/perf-lock.txt |   12 ++++++++++--
 tools/perf/builtin-lock.c              |    2 +-
 tools/perf/util/ui/browsers/top.c      |   23 +++++++++++++++++++++++
 3 files changed, 34 insertions(+), 3 deletions(-)

[GIT PULL 0/2] perf/core fixes

[Arnaldo Carvalho de Melo]

Hi Ingo,

        Please consider pulling from:

git://github.com/acmel/linux.git perf/core

Regards,

- Arnaldo

Arnaldo Carvalho de Melo (2):
  perf top tui: Don't recalc column widths considering just the first page
  perf top: Fix live annotation in the --stdio interface

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

Re: [GIT PULL 0/2] perf/core fixes

[Ingo Molnar]

* Arnaldo Carvalho de Melo <acme@infradead.org> wrote:

> Hi Ingo,
> 
>         Please consider pulling from:
> 
> git://github.com/acmel/linux.git perf/core
> 
> Regards,
> 
> - Arnaldo
> 
> Arnaldo Carvalho de Melo (2):
>   perf top tui: Don't recalc column widths considering just the first page
>   perf top: Fix live annotation in the --stdio interface
> 
>  tools/perf/builtin-top.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Pulled into tip:perf/urgent, thanks a lot Arnaldo!

	Ingo

[GIT PULL 0/2] perf/core fixes

[Arnaldo Carvalho de Melo]

Hi Ingo,

	Please consider pulling, on top of the previous req,

- Arnaldo

The following changes since commit b1ac754b67b5a875d63bee880f60ccb0c6bd8899:

  tools lib traceevent: Handle alloc_arg failure (2012-09-24 12:31:52 -0300)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux tags/perf-core-for-mingo

for you to fetch changes up to f1b2256d66fe8d613b9afcc1c16079362f9fc05c:

  tools lib traceevent: Fix error path on pevent_parse_event (2012-09-25 09:53:53 -0300)

----------------------------------------------------------------
perf/core fixes:

. The new perf_evsel__tp_sched_test 'perf test' broke the build by setting the
  'ret' variable but not using it, caught by newer gcc
  -Werror=unused-but-set-variable, fix from Namhyung Kim.

. pevent_parse_event should return a proper PEVENT_ERRNO__ and call
  pevent_free_format on its failure path, fixes from Namhyung Kim.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

----------------------------------------------------------------
Namhyung Kim (2):
      perf test: Fix build failure
      tools lib traceevent: Fix error path on pevent_parse_event

 tools/lib/traceevent/event-parse.c |    8 ++++----
 tools/perf/builtin-test.c          |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

[PATCH 1/2] perf test: Fix build failure

[Arnaldo Carvalho de Melo]

From: Namhyung Kim <namhyung.kim@lge.com>

The commit 6a6cd11d4e57 ("perf test: Add test for the sched tracepoint
format fields") added following build error:

    CC builtin-test.o
  builtin-test.c: In function ‘perf_evsel__test_field’:
  builtin-test.c:1216:6: error: variable ‘ret’ set but not used [-Werror=unused-but-set-variable]
  builtin-test.c: In function ‘perf_evsel__tp_sched_test’:
  builtin-test.c:1242:6: error: variable ‘ret’ set but not used [-Werror=unused-but-set-variable]
  cc1: all warnings being treated as errors
  make: *** [builtin-test.o] Error 1

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1348539628-3821-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-test.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-test.c b/tools/perf/builtin-test.c
index 32caf13..78b47a7 100644
--- a/tools/perf/builtin-test.c
+++ b/tools/perf/builtin-test.c
@@ -1233,7 +1233,7 @@ static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name,
 		ret = -1;
 	}
 
-	return 0;
+	return ret;
 }
 
 static int perf_evsel__tp_sched_test(void)
@@ -1286,7 +1286,7 @@ static int perf_evsel__tp_sched_test(void)
 	if (perf_evsel__test_field(evsel, "target_cpu", 4, true))
 		ret = -1;
 
-	return 0;
+	return ret;
 }
 
 static struct test {
-- 
1.7.1

[PATCH 2/2] tools lib traceevent: Fix error path on pevent_parse_event

[Arnaldo Carvalho de Melo]

From: Namhyung Kim <namhyung@kernel.org>

If __pevent_parse_format() succeeded but add_event() failed, 'ret' didn't
have a proper error code.  Set it to PEVENT_ERRNO__MEM_ALLOC_FAILED.

In addition, at that point 'event' also has fields and format
information and they all need to be freed.  Call pevent_free_format() to
handle it.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1348575919-4954-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/lib/traceevent/event-parse.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 17c9221..47264b4 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -5044,8 +5044,10 @@ enum pevent_errno pevent_parse_event(struct pevent *pevent, const char *buf,
 	/* Add pevent to event so that it can be referenced */
 	event->pevent = pevent;
 
-	if (add_event(pevent, event))
+	if (add_event(pevent, event)) {
+		ret = PEVENT_ERRNO__MEM_ALLOC_FAILED;
 		goto event_add_failed;
+	}
 
 #define PRINT_ARGS 0
 	if (PRINT_ARGS && event->print_fmt.args)
@@ -5054,9 +5056,7 @@ enum pevent_errno pevent_parse_event(struct pevent *pevent, const char *buf,
 	return 0;
 
 event_add_failed:
-	free(event->system);
-	free(event->name);
-	free(event);
+	pevent_free_format(event);
 	return ret;
 }
 
-- 
1.7.1

Re: [GIT PULL 0/2] perf/core fixes

[Ingo Molnar]

* Arnaldo Carvalho de Melo <acme@infradead.org> wrote:

> Hi Ingo,
> 
> 	Please consider pulling, on top of the previous req,
> 
> - Arnaldo
> 
> The following changes since commit b1ac754b67b5a875d63bee880f60ccb0c6bd8899:
> 
>   tools lib traceevent: Handle alloc_arg failure (2012-09-24 12:31:52 -0300)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux tags/perf-core-for-mingo
> 
> for you to fetch changes up to f1b2256d66fe8d613b9afcc1c16079362f9fc05c:
> 
>   tools lib traceevent: Fix error path on pevent_parse_event (2012-09-25 09:53:53 -0300)
> 
> ----------------------------------------------------------------
> perf/core fixes:
> 
> . The new perf_evsel__tp_sched_test 'perf test' broke the build by setting the
>   'ret' variable but not using it, caught by newer gcc
>   -Werror=unused-but-set-variable, fix from Namhyung Kim.
> 
> . pevent_parse_event should return a proper PEVENT_ERRNO__ and call
>   pevent_free_format on its failure path, fixes from Namhyung Kim.
> 
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> ----------------------------------------------------------------
> Namhyung Kim (2):
>       perf test: Fix build failure
>       tools lib traceevent: Fix error path on pevent_parse_event
> 
>  tools/lib/traceevent/event-parse.c |    8 ++++----
>  tools/perf/builtin-test.c          |    4 ++--
>  2 files changed, 6 insertions(+), 6 deletions(-)

Pulled, thanks Arnaldo!

	Ingo