linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Taeung Song <treeze.taeung@gmail.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: linux-kernel@vger.kernel.org, jolsa@redhat.com,
	namhyung@kernel.org, Ingo Molnar <mingo@redhat.com>,
	Taeung Song <treeze.taeung@gmail.com>
Subject: [PATCH 4/5] perf mem: Fill in the missing freeing a session after an error occur
Date: Tue, 30 Jun 2015 17:15:23 +0900	[thread overview]
Message-ID: <1435652124-22414-5-git-send-email-treeze.taeung@gmail.com> (raw)
In-Reply-To: <1435652124-22414-1-git-send-email-treeze.taeung@gmail.com>

When an error occur a 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 occur.

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
 tools/perf/builtin-mem.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
index da2ec06..8b6d473 100644
--- a/tools/perf/builtin-mem.c
+++ b/tools/perf/builtin-mem.c
@@ -135,24 +135,27 @@ static int report_raw_events(struct perf_mem *mem)
 	if (mem->cpu_list) {
 		ret = perf_session__cpu_bitmap(session, mem->cpu_list,
 					       mem->cpu_bitmap);
-		if (ret)
+		if (ret) {
+			ret = err;
 			goto out_delete;
+		}
 	}
 
-	if (symbol__init(&session->header.env) < 0)
-		return -1;
+	ret = symbol__init(&session->header.env);
+	if (ret < 0)
+		goto out_delete;
 
 	printf("# PID, TID, IP, ADDR, LOCAL WEIGHT, DSRC, SYMBOL\n");
 
 	err = perf_session__process_events(session);
 	if (err)
-		return err;
-
-	return 0;
+		ret = err;
+	else
+		ret = 0;
 
 out_delete:
 	perf_session__delete(session);
-	return err;
+	return ret;
 }
 
 static int report_events(int argc, const char **argv, struct perf_mem *mem)
-- 
1.9.1


  parent reply	other threads:[~2015-06-30  8:16 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-30  8:15 [PATCH 0/5] perf session: Fill in the missing freeing a session after an error occur Taeung Song
2015-06-30  8:15 ` [PATCH 1/5] perf inject: " Taeung Song
2015-06-30 11:21   ` Jiri Olsa
2015-07-03  7:48   ` [tip:perf/urgent] perf inject: Fill in the missing session freeing after an error occurs tip-bot for Taeung Song
2015-06-30  8:15 ` [PATCH 2/5] perf kmem: Fill in the missing freeing a session after an error occur Taeung Song
2015-06-30 11:22   ` Jiri Olsa
2015-07-03  7:48   ` [tip:perf/urgent] perf kmem: Fill in the missing session freeing after an error occurs tip-bot for Taeung Song
2015-06-30  8:15 ` [PATCH 3/5] perf kvm: Fill in the missing freeing a session after an error occur Taeung Song
2015-06-30 11:14   ` Jiri Olsa
2015-06-30  8:15 ` Taeung Song [this message]
2015-06-30 11:17   ` [PATCH 4/5] perf mem: " Jiri Olsa
2015-06-30  8:15 ` [PATCH 5/5] perf report: " Taeung Song
2015-06-30 11:20   ` Jiri Olsa
2015-07-03  7:48   ` [tip:perf/urgent] perf report: Fill in the missing session freeing after an error occurs tip-bot for Taeung Song

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1435652124-22414-5-git-send-email-treeze.taeung@gmail.com \
    --to=treeze.taeung@gmail.com \
    --cc=acme@kernel.org \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=namhyung@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).