Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1175553

[PATCH 4/8] perf report: Fill in the missing session freeing after an error occurs

Show all headers | View raw

From: Taeung Song <treeze.taeung@gmail.com>

When an error occurs an error value is just returned without freeing the
session. So allocating and freeing session have to be matched as a pair
even if an error occurs.

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1435652124-22414-6-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-report.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 348bed4a2abf..95a47719aec3 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -839,8 +839,10 @@ repeat:
 	if (report.header || report.header_only) {
 		perf_session__fprintf_info(session, stdout,
 					   report.show_full_info);
-		if (report.header_only)
-			return 0;
+		if (report.header_only) {
+			ret = 0;
+			goto error;
+		}
 	} else if (use_browser == 0) {
 		fputs("# To display the perf.data header info, please use --header/--header-only options.\n#\n",
 		      stdout);
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 0/8] perf/core fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-07-01 23:30 +0200
  [PATCH 7/8] perf tools: Create config.detected into OUTPUT directory Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-07-01 23:30 +0200
  [PATCH 8/8] perf tools: Allow to specify custom linker command Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-07-01 23:30 +0200
  [PATCH 5/8] perf kvm: Fill in the missing session freeing after an error occurs Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-07-01 23:30 +0200
  [PATCH 4/8] perf report: Fill in the missing session freeing after an error occurs Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-07-01 23:30 +0200
  [PATCH 3/8] perf kmem: Fill in the missing session freeing after an error occurs Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-07-01 23:30 +0200
  Re: [GIT PULL 0/8] perf/core fixes Ingo Molnar <mingo@kernel.org> - 2015-07-02 11:00 +0200
  Re: [GIT PULL 0/8] perf/core fixes Ingo Molnar <mingo@kernel.org> - 2015-07-02 11:00 +0200
    Re: [GIT PULL 0/8] perf/core fixes Jiri Olsa <jolsa@redhat.com> - 2015-07-02 11:20 +0200
      Re: [GIT PULL 0/8] perf/core fixes Ingo Molnar <mingo@kernel.org> - 2015-07-02 11:30 +0200

csiph-web