[GIT PULL 0/2] perf/urgent fixes

[GIT PULL 0/2] perf/urgent fixes

[Jiri Olsa]

hi Ingo,
please consider pulling

thanks,
jirka


The following changes since commit fbdd17ec5ce2e5e4027356fcfde769b88d15702f:

  Merge branch 'perf-core-for-mingo' into perf/urgent (2014-04-14 16:45:39 +0200)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git tags/perf-urgent-for-mingo

for you to fetch changes up to c9e87a472594fd237b2d19dcbe4a3424297f0b1a:

  perf tools: Instead of redirecting flex output, use -o (2014-04-15 13:57:21 +0200)

----------------------------------------------------------------
perf/urgent fixes:

Developer stuff:
. Instead of redirecting flex output, use -o (Cody P Schafer)

. Fix double free in perf test 21 (Adrian Hunter)

Signed-off-by: Jiri Olsa <jolsa@redhat.com>

----------------------------------------------------------------
Adrian Hunter (1):
      perf tools: Fix double free in perf test 21 (code-reading.c)

Cody P Schafer (1):
      perf tools: Instead of redirecting flex output, use -o

 tools/perf/Makefile.perf        | 4 ++--
 tools/perf/tests/code-reading.c | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

[PATCH 1/2] perf tools: Fix double free in perf test 21 (code-reading.c)

[Jiri Olsa]

From: Adrian Hunter <adrian.hunter@intel.com>

perf_evlist__delete() deletes attached cpu and thread maps
but the test is still using them, so remove them from the
evlist before deleting it.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Link: http://lkml.kernel.org/r/53465E3E.8070201@intel.com
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
 tools/perf/tests/code-reading.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c
index 653a8fe..bfb1869 100644
--- a/tools/perf/tests/code-reading.c
+++ b/tools/perf/tests/code-reading.c
@@ -504,6 +504,7 @@ static int do_test_code_reading(bool try_kcore)
 		if (ret < 0) {
 			if (!excl_kernel) {
 				excl_kernel = true;
+				perf_evlist__set_maps(evlist, NULL, NULL);
 				perf_evlist__delete(evlist);
 				evlist = NULL;
 				continue;
-- 
1.8.3.1

[PATCH 2/2] perf tools: Instead of redirecting flex output, use -o

[Jiri Olsa]

From: Cody P Schafer <cody@linux.vnet.ibm.com>

This gives us a real filename instead of having '<stdout>' show up all
over the place when debugging.

Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/1396652539-2416-1-git-send-email-cody@linux.vnet.ibm.com
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
 tools/perf/Makefile.perf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 50d875d..e969233 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -192,13 +192,13 @@ endif
 export PERL_PATH
 
 $(OUTPUT)util/parse-events-flex.c: util/parse-events.l $(OUTPUT)util/parse-events-bison.c
-	$(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/parse-events-flex.h $(PARSER_DEBUG_FLEX) -t util/parse-events.l > $(OUTPUT)util/parse-events-flex.c
+	$(QUIET_FLEX)$(FLEX) -o $@ --header-file=$(OUTPUT)util/parse-events-flex.h $(PARSER_DEBUG_FLEX) util/parse-events.l
 
 $(OUTPUT)util/parse-events-bison.c: util/parse-events.y
 	$(QUIET_BISON)$(BISON) -v util/parse-events.y -d $(PARSER_DEBUG_BISON) -o $(OUTPUT)util/parse-events-bison.c -p parse_events_
 
 $(OUTPUT)util/pmu-flex.c: util/pmu.l $(OUTPUT)util/pmu-bison.c
-	$(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/pmu-flex.h -t util/pmu.l > $(OUTPUT)util/pmu-flex.c
+	$(QUIET_FLEX)$(FLEX) -o $@ --header-file=$(OUTPUT)util/pmu-flex.h util/pmu.l
 
 $(OUTPUT)util/pmu-bison.c: util/pmu.y
 	$(QUIET_BISON)$(BISON) -v util/pmu.y -d -o $(OUTPUT)util/pmu-bison.c -p perf_pmu_
-- 
1.8.3.1

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

[Ingo Molnar]

* Jiri Olsa <jolsa@redhat.com> wrote:

> hi Ingo,
> please consider pulling
> 
> thanks,
> jirka
> 
> 
> The following changes since commit fbdd17ec5ce2e5e4027356fcfde769b88d15702f:
> 
>   Merge branch 'perf-core-for-mingo' into perf/urgent (2014-04-14 16:45:39 +0200)
> 
> are available in the git repository at:
> 
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git tags/perf-urgent-for-mingo
> 
> for you to fetch changes up to c9e87a472594fd237b2d19dcbe4a3424297f0b1a:
> 
>   perf tools: Instead of redirecting flex output, use -o (2014-04-15 13:57:21 +0200)
> 
> ----------------------------------------------------------------
> perf/urgent fixes:
> 
> Developer stuff:
> . Instead of redirecting flex output, use -o (Cody P Schafer)
> 
> . Fix double free in perf test 21 (Adrian Hunter)
> 
> Signed-off-by: Jiri Olsa <jolsa@redhat.com>
> 
> ----------------------------------------------------------------
> Adrian Hunter (1):
>       perf tools: Fix double free in perf test 21 (code-reading.c)
> 
> Cody P Schafer (1):
>       perf tools: Instead of redirecting flex output, use -o
> 
>  tools/perf/Makefile.perf        | 4 ++--
>  tools/perf/tests/code-reading.c | 1 +
>  2 files changed, 3 insertions(+), 2 deletions(-)

Pulled, thanks a lot Jiri!

	Ingo