Signed-off-by: Liu Ping Fan <pingf...@linux.vnet.ibm.com> --- include/qemu/object.h | 3 ++- qom/object.c | 11 +++++------ 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/qemu/object.h b/include/qemu/object.h index cc75fee..0c02614 100644 --- a/include/qemu/object.h +++ b/include/qemu/object.h @@ -18,6 +18,7 @@ #include <stdint.h> #include <stdbool.h> #include "qemu-queue.h" +#include "qemu/atomic.h" struct Visitor; struct Error; @@ -262,7 +263,7 @@ struct Object /*< private >*/ ObjectClass *class; QTAILQ_HEAD(, ObjectProperty) properties; - uint32_t ref; + Atomic ref; Object *parent; }; diff --git a/qom/object.c b/qom/object.c index e3e9242..34ec2a1 100644 --- a/qom/object.c +++ b/qom/object.c @@ -383,7 +383,7 @@ void object_finalize(void *data) object_deinit(obj, ti); object_property_del_all(obj); - g_assert(obj->ref == 0); + g_assert(atomic_read(&obj->ref) == 0); } Object *object_new_with_type(Type type) @@ -410,7 +410,7 @@ Object *object_new(const char *typename) void object_delete(Object *obj) { object_unparent(obj); - g_assert(obj->ref == 1); + g_assert(atomic_read(&obj->ref) == 1); object_unref(obj); g_free(obj); } @@ -600,16 +600,15 @@ GSList *object_class_get_list(const char *implements_type, void object_ref(Object *obj) { - obj->ref++; + atomic_inc(&obj->ref); } void object_unref(Object *obj) { - g_assert(obj->ref > 0); - obj->ref--; + g_assert(atomic_read(&obj->ref) > 0); /* parent always holds a reference to its children */ - if (obj->ref == 0) { + if (atomic_return_and_sub(1, &obj->ref) == 1) { object_finalize(obj); } } -- 1.7.4.4