mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qom: make object_delete usable for statically-allocated objects

Browse Source 
Store in the object the freeing function that will be used at deletion
time.  This makes it possible to use object_delete on statically-allocated
(embedded) objects.  Dually, it makes it possible to use object_unparent
and object_unref without leaking memory, when the lifetime of object
might extend until after the call to object_delete.

Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2012-11-23 09:47:14 +01:00 committed by Anthony Liguori
parent 667d22d1ae
commit fde9bf4470
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/qemu/object.h
View File

@ -238,6 +238,14 @@ typedef struct ObjectProperty
*/ */
typedef void (ObjectUnparent)(Object *obj); typedef void (ObjectUnparent)(Object *obj);
/**
* ObjectFree:
* @obj: the object being freed
*
* Called when an object's last reference is removed.
*/
typedef void (ObjectFree)(void *obj);
/** /**
* ObjectClass: * ObjectClass:
* *
@ -272,6 +280,7 @@ struct Object
{ {
/*< private >*/ /*< private >*/
ObjectClass *class; ObjectClass *class;
ObjectFree *free;
QTAILQ_HEAD(, ObjectProperty) properties; QTAILQ_HEAD(, ObjectProperty) properties;
uint32_t ref; uint32_t ref;
Object *parent; Object *parent;

5
qom/object.c
View File

@ -388,6 +388,9 @@ void object_finalize(void *data)
object_property_del_all(obj); object_property_del_all(obj);
g_assert(obj->ref == 0); g_assert(obj->ref == 0);
if (obj->free) {
obj->free(obj);
}
} }
Object *object_new_with_type(Type type) Object *object_new_with_type(Type type)
@ -399,6 +402,7 @@ Object *object_new_with_type(Type type)
obj = g_malloc(type->instance_size); obj = g_malloc(type->instance_size);
object_initialize_with_type(obj, type); object_initialize_with_type(obj, type);
obj->free = g_free;
return obj; return obj;
} }
@ -415,7 +419,6 @@ void object_delete(Object *obj)
object_unparent(obj); object_unparent(obj);
g_assert(obj->ref == 1); g_assert(obj->ref == 1);
object_unref(obj); object_unref(obj);
g_free(obj);
} }
Object *object_dynamic_cast(Object *obj, const char *typename) Object *object_dynamic_cast(Object *obj, const char *typename)