Patchwork [v2,2/2] object: Object apply the refcnt interface by Qref

login
register
mail settings
Submitter pingfan liu
Date July 16, 2013, 4:36 a.m.
Message ID <1373949390-3642-2-git-send-email-pingfank@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/259344/
State New
Headers show

Comments

pingfan liu - July 16, 2013, 4:36 a.m.
Signed-off-by: Liu Ping Fan <pingfank@linux.vnet.ibm.com>
---
 include/qom/object.h |  3 ++-
 qom/object.c         | 15 +++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

Patch

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 <stdint.h>
 #include <stdbool.h>
 #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,