From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752553AbcFZKyg (ORCPT ); Sun, 26 Jun 2016 06:54:36 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51032 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752263AbcFZKye (ORCPT ); Sun, 26 Jun 2016 06:54:34 -0400 Date: Sun, 26 Jun 2016 03:54:22 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: dsahern@gmail.com, wangnan0@huawei.com, mingo@kernel.org, mhiramat@kernel.org, adrian.hunter@intel.com, acme@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, jolsa@kernel.org, hpa@zytor.com, namhyung@kernel.org Reply-To: mingo@kernel.org, mhiramat@kernel.org, dsahern@gmail.com, wangnan0@huawei.com, hpa@zytor.com, namhyung@kernel.org, acme@redhat.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, jolsa@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf machine: Destructors should accept NULL Git-Commit-ID: 32ca678dcd250f05183cf0c8a9e516545c6068bc 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: 32ca678dcd250f05183cf0c8a9e516545c6068bc Gitweb: http://git.kernel.org/tip/32ca678dcd250f05183cf0c8a9e516545c6068bc Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 22 Jun 2016 10:19:11 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 22 Jun 2016 10:19:11 -0300 perf machine: Destructors should accept NULL And do nothing, just like free(), to avoid having to test it in callers, usually in error paths. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-q42gj3b3znhho9z1mrbo4jce@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/machine.c | 6 ++++-- tools/perf/util/probe-event.c | 6 ++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index a0c186a..bc2cdbd 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -138,8 +138,10 @@ void machine__exit(struct machine *machine) void machine__delete(struct machine *machine) { - machine__exit(machine); - free(machine); + if (machine) { + machine__exit(machine); + free(machine); + } } void machines__init(struct machines *machines) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 084756c..caad19d 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -102,10 +102,8 @@ out: void exit_probe_symbol_maps(void) { - if (host_machine) { - machine__delete(host_machine); - host_machine = NULL; - } + machine__delete(host_machine); + host_machine = NULL; symbol__exit(); }