From patchwork Tue Jul 16 04:36:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 259344 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 0353F2C0186 for ; Tue, 16 Jul 2013 14:40:13 +1000 (EST) Received: from localhost ([::1]:57467 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uyx3b-0002pw-1i for incoming@patchwork.ozlabs.org; Tue, 16 Jul 2013 00:40:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uyx3H-0002nE-5f for qemu-devel@nongnu.org; Tue, 16 Jul 2013 00:39:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uyx3G-0001ky-A6 for qemu-devel@nongnu.org; Tue, 16 Jul 2013 00:39:51 -0400 Received: from mail-ie0-x236.google.com ([2607:f8b0:4001:c03::236]:39533) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uyx3G-0001ku-5u for qemu-devel@nongnu.org; Tue, 16 Jul 2013 00:39:50 -0400 Received: by mail-ie0-f182.google.com with SMTP id s9so618115iec.27 for ; Mon, 15 Jul 2013 21:39:49 -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=66LFisJTjZBf0wD0tMgnUWhz9yrZ1kf0f8EcBlg+V80=; b=u1Qt23X6wpWRNV+NJEKMD8mMcvO062nKKrSWb+FEKGKleMviWzBZCm7Mga4Kgglopm Yb2iGkqPlNsxN2XYG2UtL2EtAKieKM8kU83idshY3+FStVWaJctOc1V1T5tOrFBkbpYG Tz1jmt1SumhQ+rcyVrHJVeICDxirLqou4+egs2dOXW6eu4pKp6XtKxx1mwrjOOwZyPTc q+AQAaE8k7eMaS4lujBS0PLdFekZVpdw2Yo5EDcMaV7pTIpKuKYMGUug6pi+9wxv5m6Z 3gHXDMds0odBhMF6UBbE4/I0ZiXeT7gs6kGJ7wACArFukbLODEyJFHcK2Z7iHMSss9GY oOLQ== X-Received: by 10.50.13.72 with SMTP id f8mr8835089igc.53.1373949589600; Mon, 15 Jul 2013 21:39:49 -0700 (PDT) Received: from localhost ([202.108.130.138]) by mx.google.com with ESMTPSA id y9sm22773114iga.9.2013.07.15.21.39.45 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 15 Jul 2013 21:39:48 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2013 12:36:30 +0800 Message-Id: <1373949390-3642-2-git-send-email-pingfank@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1373949390-3642-1-git-send-email-pingfank@linux.vnet.ibm.com> References: <1373949390-3642-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::236 Cc: Paolo Bonzini , Richard Henderson Subject: [Qemu-devel] [PATCH v2 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 | 3 ++- qom/object.c | 15 +++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index 23fc048..6331972 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -18,6 +18,7 @@ #include #include #include "qemu/queue.h" +#include "qemu/refcnt.h" struct Visitor; struct Error; @@ -384,7 +385,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..e7e5c26 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_inc(&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_dec(&obj->ref, object_finalize); } void object_property_add(Object *obj, const char *name, const char *type,