From patchwork Mon Jul 15 02:49:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 258933 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 665272C00EA for ; Mon, 15 Jul 2013 12:51:39 +1000 (EST) Received: from localhost ([::1]:50943 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UyYsz-0008Qt-3Z for incoming@patchwork.ozlabs.org; Sun, 14 Jul 2013 22:51:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UyYsG-0007kK-8n for qemu-devel@nongnu.org; Sun, 14 Jul 2013 22:50:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UyYsF-0004Y1-FU for qemu-devel@nongnu.org; Sun, 14 Jul 2013 22:50:52 -0400 Received: from mail-ie0-x22c.google.com ([2607:f8b0:4001:c03::22c]:64389) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UyYsF-0004Xx-A2 for qemu-devel@nongnu.org; Sun, 14 Jul 2013 22:50:51 -0400 Received: by mail-ie0-f172.google.com with SMTP id 16so25442980iea.3 for ; Sun, 14 Jul 2013 19:50:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=QLCZ7n308pl7s/ZKXDkkjkHIlknR6qOLKVZy2b3Sx8A=; b=nT51XvW0slF8lez1N6bslrHCycgEpipvrTolFhA5wqBS965I4UN2uj7JvdOUe3cCHH vQOyNlRQgwKNN6T7ZSft/EyVLe1quexNt7+fXKA2ImDAdkzzeaSjirXfpm9+vo93tAf6 Y3NOGZT9wLI6KMEVL+HWbEmD5K8SWre2ycJmm5dNFNOlUnHSZr8TTnJ22F0bcHcSpYdw HCS/2wua00WNEyJLq7bMea4EpzRauDFyvJQwXo68Kuv8oYhQMi1/vTxGZd2kaupbZRmB IRW49qewUZuDewXEFx9VcU5Y/xPz/+Ff1aDM69ljPLyoGSYmrcUay3aDMHlp8zNt6nuP MFOg== X-Received: by 10.50.47.12 with SMTP id z12mr5748424igm.50.1373856650601; Sun, 14 Jul 2013 19:50:50 -0700 (PDT) Received: from localhost ([202.108.130.138]) by mx.google.com with ESMTPSA id t10sm15853919igz.9.2013.07.14.19.50.47 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 14 Jul 2013 19:50:49 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Mon, 15 Jul 2013 10:49:16 +0800 Message-Id: <1373856556-22272-2-git-send-email-pingfank@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1373856556-22272-1-git-send-email-pingfank@linux.vnet.ibm.com> References: <1373856556-22272-1-git-send-email-pingfank@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c03::22c Cc: Paolo Bonzini , Richard Henderson Subject: [Qemu-devel] [PATCH 2/2] object: Object apply the refcnt interface by Qref X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Liu Ping Fan --- include/qom/object.h | 2 +- qom/object.c | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index 2e165fb..8426dd1 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -389,7 +389,7 @@ struct Object ObjectClass *class; ObjectFree *free; QTAILQ_HEAD(, ObjectProperty) properties; - uint32_t ref; + Qref ref; Object *parent; }; diff --git a/qom/object.c b/qom/object.c index b2479d1..736d4ba 100644 --- a/qom/object.c +++ b/qom/object.c @@ -388,15 +388,15 @@ static void object_deinit(Object *obj, TypeImpl *type) } } -static void object_finalize(void *data) +static void object_finalize(Qref *qref) { - Object *obj = data; + Object *obj = container_of(qref, Object, ref); TypeImpl *ti = obj->class->type; object_deinit(obj, ti); object_property_del_all(obj); - g_assert(obj->ref == 0); + g_assert(qref->count == 0); if (obj->free) { obj->free(obj); } @@ -683,17 +683,12 @@ GSList *object_class_get_list(const char *implements_type, void object_ref(Object *obj) { - atomic_inc(&obj->ref); + qref_get(&obj->ref); } void object_unref(Object *obj) { - g_assert(obj->ref > 0); - - /* parent always holds a reference to its children */ - if (atomic_fetch_dec(&obj->ref) == 1) { - object_finalize(obj); - } + qref_put(&obj->ref, object_finalize); } void object_property_add(Object *obj, const char *name, const char *type,