From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753134AbbGaNyJ (ORCPT ); Fri, 31 Jul 2015 09:54:09 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57141 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753106AbbGaNyG (ORCPT ); Fri, 31 Jul 2015 09:54:06 -0400 Date: Fri, 31 Jul 2015 06:53:52 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: bp@suse.de, tglx@linutronix.de, namhyung@kernel.org, adrian.hunter@intel.com, jolsa@redhat.com, eranian@google.com, hpa@zytor.com, acme@redhat.com, mingo@kernel.org, fweisbec@gmail.com, kan.liang@intel.com, linux-kernel@vger.kernel.org, dsahern@gmail.com Reply-To: linux-kernel@vger.kernel.org, dsahern@gmail.com, acme@redhat.com, mingo@kernel.org, fweisbec@gmail.com, kan.liang@intel.com, tglx@linutronix.de, adrian.hunter@intel.com, namhyung@kernel.org, eranian@google.com, jolsa@redhat.com, hpa@zytor.com, bp@suse.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf session env: Rename exit method Git-Commit-ID: 4c7de49a2977aa2a0f556c803afbb24848372e7a X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4c7de49a2977aa2a0f556c803afbb24848372e7a Gitweb: http://git.kernel.org/tip/4c7de49a2977aa2a0f556c803afbb24848372e7a Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 29 Jul 2015 12:18:24 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 29 Jul 2015 12:59:03 -0300 perf session env: Rename exit method The semantic associated in tools/perf/ with foo__delete(instance) is to release all resources referenced by 'instance' members and then release the memory for 'instance' itself. The perf_session_env__delete() function isn't doing this, it just does the first part, but the space used by 'instance' itself isn't freed, as it is embedded in a larger structure, that will be freed at other stage. For these cases we se foo__exit(), i.e. the usage is: void foo__delete(foo) { if (foo) { foo__exit(foo); free(foo); } } But when we have something like: struct bar { struct foo foo; . . . } Then we can't really call foo__delete(&bar.foo), we must have this instead: void bar__exit(bar) { foo__exit(&bar.foo); /* free other bar-> resources */ } void bar__delete(bar) { if (bar) { bar__exit(bar); free(bar); } } So just rename perf_session_env__delete() to perf_session_env__exit(). Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Kan Liang Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-djbgpcfo5udqptx3q0flwtmk@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 2d95747..f51eb54 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -170,7 +170,7 @@ static void perf_session__delete_threads(struct perf_session *session) machine__delete_threads(&session->machines.host); } -static void perf_session_env__delete(struct perf_session_env *env) +static void perf_session_env__exit(struct perf_session_env *env) { zfree(&env->hostname); zfree(&env->os_release); @@ -193,7 +193,7 @@ void perf_session__delete(struct perf_session *session) auxtrace_index__free(&session->auxtrace_index); perf_session__destroy_kernel_maps(session); perf_session__delete_threads(session); - perf_session_env__delete(&session->header.env); + perf_session_env__exit(&session->header.env); machines__exit(&session->machines); if (session->file) perf_data_file__close(session->file);