From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753443AbbE0QsH (ORCPT ); Wed, 27 May 2015 12:48:07 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38917 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752666AbbE0QsB (ORCPT ); Wed, 27 May 2015 12:48:01 -0400 Date: Wed, 27 May 2015 09:47:45 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: dzickus@redhat.com, acme@redhat.com, jolsa@redhat.com, bp@suse.de, fweisbec@gmail.com, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, eranian@google.com, namhyung@kernel.org, adrian.hunter@intel.com, hpa@zytor.com, dsahern@gmail.com Reply-To: fweisbec@gmail.com, jolsa@redhat.com, bp@suse.de, acme@redhat.com, dzickus@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, dsahern@gmail.com, hpa@zytor.com, adrian.hunter@intel.com, eranian@google.com, namhyung@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf comm: Use atomic.h for refcounting Git-Commit-ID: 86c19525b7e953217e5ad2b5496029b1ac6fe26b 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: 86c19525b7e953217e5ad2b5496029b1ac6fe26b Gitweb: http://git.kernel.org/tip/86c19525b7e953217e5ad2b5496029b1ac6fe26b Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 19 May 2015 19:07:42 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 27 May 2015 12:21:43 -0300 perf comm: Use atomic.h for refcounting Now that we have atomic.h, we should convert all of the existing refcounts to use it. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-quzeuy3jwsyod6e06o39cl6y@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/comm.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/comm.c b/tools/perf/util/comm.c index b2bb59d..21b7ff3 100644 --- a/tools/perf/util/comm.c +++ b/tools/perf/util/comm.c @@ -2,24 +2,27 @@ #include "util.h" #include #include +#include struct comm_str { char *str; struct rb_node rb_node; - int ref; + atomic_t refcnt; }; /* Should perhaps be moved to struct machine */ static struct rb_root comm_str_root; -static void comm_str__get(struct comm_str *cs) +static struct comm_str *comm_str__get(struct comm_str *cs) { - cs->ref++; + if (cs) + atomic_inc(&cs->refcnt); + return cs; } static void comm_str__put(struct comm_str *cs) { - if (!--cs->ref) { + if (cs && atomic_dec_and_test(&cs->refcnt)) { rb_erase(&cs->rb_node, &comm_str_root); zfree(&cs->str); free(cs); @@ -40,6 +43,8 @@ static struct comm_str *comm_str__alloc(const char *str) return NULL; } + atomic_set(&cs->refcnt, 0); + return cs; }