Eo: Added a check if object is already deleted in eo_unref.

[profile/ivi/eobj.git] / lib / eo.c

diff --git a/lib/eo.c b/lib/eo.c
index c9ab366..823f344 100644 (file)
--- a/lib/eo.c
+++ b/lib/eo.c
@@ -45,6 +45,7 @@ struct _Eo {
 
      Eo_Kls_Itr mro_itr;
 
+     Eina_Bool composite:1;
      Eina_Bool del:1;
      Eina_Bool construct_error:1;
      Eina_Bool manual_free:1;
@@ -307,7 +308,7 @@ _eo_kls_itr_next(Eo_Kls_Itr *cur, Eo_Op op)
    if (cur->op != op)
      {
         Eo_Op node_op = cur->op;
-        ERR("Called with op %d ('%s') while expecting: %d ('%s'). This probaly means you called eo_*_super functions from a wrong place.",
+        ERR("Called with op %x ('%s') while expecting: %x ('%s'). This probaly means you called eo_*_super functions from a wrong place.",
               op, _eo_op_id_name_get(op),
               node_op, _eo_op_id_name_get(node_op));
         return NULL;
@@ -385,13 +386,13 @@ _eo_op_internal(Eo *obj, Eo_Op_Type op_type, Eo_Op op, va_list *p_list)
      {
         if (op_desc->op_type == EO_OP_TYPE_CLASS)
           {
-             ERR("Tried calling a class op '%s' (%d) from a non-class context.", (op_desc) ? op_desc->name : NULL, op);
+             ERR("Tried calling a class op '%s' (%x) from a non-class context.", (op_desc) ? op_desc->name : NULL, op);
              return EINA_FALSE;
           }
         else if ((op_type == EO_OP_TYPE_CONST) &&
               (op_desc->op_type != EO_OP_TYPE_CONST))
           {
-             ERR("Tried calling non-const or non-existant op '%s' (%d) from a const (query) function.", (op_desc) ? op_desc->name : NULL, op);
+             ERR("Tried calling non-const or non-existant op '%s' (%x) from a const (query) function.", (op_desc) ? op_desc->name : NULL, op);
              return EINA_FALSE;
           }
      }
@@ -497,7 +498,7 @@ _eo_class_op_internal(Eo_Class *klass, Eo_Op op, va_list *p_list)
      {
         if (op_desc->op_type != EO_OP_TYPE_CLASS)
           {
-             ERR("Tried calling an instant op '%s' (%d) from a class context.", (op_desc) ? op_desc->name : NULL, op);
+             ERR("Tried calling an instance op '%s' (%x) from a class context.", (op_desc) ? op_desc->name : NULL, op);
              return EINA_FALSE;
           }
      }
@@ -751,17 +752,26 @@ eo_class_funcs_set(Eo_Class *klass, const Eo_Op_Func_Description *func_descs)
    itr = func_descs;
    if (itr)
      {
-        for ( ; itr->op != 0 ; itr++)
+        for ( ; itr->op_type != EO_OP_TYPE_INVALID ; itr++)
           {
              const Eo_Op_Description *op_desc = _eo_op_id_desc_get(itr->op);
 
-             if (EINA_LIKELY(!op_desc || (itr->op_type == op_desc->op_type)))
+             if (EINA_UNLIKELY(!op_desc || (itr->op == EO_NOOP)))
+               {
+                  ERR("Setting implementation for non-existent op %x for class '%s'. Func index: %d", itr->op, klass->desc->name, itr - func_descs);
+               }
+             else if (EINA_LIKELY(itr->op_type == op_desc->op_type))
                {
                   _dich_func_set(klass, itr->op, itr->func);
                }
              else
                {
-                  ERR("Set function's op type (%d) is different than the one in the op description (%d) for op '%s' in class '%s'.", itr->op_type, op_desc->op_type, op_desc->name, klass->desc->name);
+                  ERR("Set function's op type (%x) is different than the one in the op description (%d) for op '%s' in class '%s'. Func index: %d",
+                        itr->op_type,
+                        (op_desc) ? op_desc->op_type : EO_OP_TYPE_REGULAR,
+                        (op_desc) ? op_desc->name : NULL,
+                        klass->desc->name,
+                        itr - func_descs);
                }
           }
      }
@@ -828,11 +838,11 @@ _eo_class_check_op_descs(const Eo_Class *klass, Eo_Class_Id id)
           {
              if (itr->name)
                {
-                  ERR("Wrong order in Ops description for class '%s'. Expected %d and got %d", desc->name, i, itr->sub_op);
+                  ERR("Wrong order in Ops description for class '%s'. Expected %x and got %x", desc->name, i, itr->sub_op);
                }
              else
                {
-                  ERR("Found too few Ops description for class '%s'. Expected %d descriptions, but found %d.", desc->name, desc->ops.count, i);
+                  ERR("Found too few Ops description for class '%s'. Expected %x descriptions, but found %x.", desc->name, desc->ops.count, i);
                }
              return EINA_FALSE;
           }
@@ -1069,13 +1079,21 @@ eo_parent_set(Eo *obj, const Eo *parent)
    if (parent)
       EO_MAGIC_RETURN_VAL(parent, EO_EINA_MAGIC, EINA_FALSE);
 
+   if (obj->parent == parent)
+      return EINA_TRUE;
+
    _eo_ref(obj);
 
+   if (eo_composite_is(obj))
+     {
+        eo_composite_object_detach(obj->parent, obj);
+     }
+
    if (obj->parent)
      {
         obj->parent->children =
            eina_inlist_remove(obj->parent->children, EINA_INLIST_GET(obj));
-//        eo_xunref(obj, obj->parent);
+        eo_xunref(obj, obj->parent);
      }
 
    obj->parent = (Eo *) parent;
@@ -1083,7 +1101,7 @@ eo_parent_set(Eo *obj, const Eo *parent)
      {
         obj->parent->children =
            eina_inlist_append(obj->parent->children, EINA_INLIST_GET(obj));
-//        eo_xref(obj, obj->parent);
+        eo_xref(obj, obj->parent);
      }
 
    _eo_unref(obj);
@@ -1166,7 +1184,6 @@ eo_xref_internal(Eo *obj, const Eo *ref_obj, const char *file, int line)
    xref->file = file;
    xref->line = line;
 
-   /* FIXME: Make it sorted. */
    obj->xrefs = eina_inlist_prepend(obj->xrefs, EINA_INLIST_GET(xref));
 #else
    (void) ref_obj;
@@ -1256,7 +1273,6 @@ _eo_del_internal(Eo *obj)
           }
      }
 
-   eo_parent_set(obj, NULL);
    while (obj->children)
      {
         eo_parent_set(EINA_INLIST_CONTAINER_GET(obj->children, Eo), NULL);
@@ -1278,6 +1294,12 @@ _eo_unref(Eo *obj)
 {
    if (--(obj->refcount) == 0)
      {
+        if (obj->del)
+          {
+             ERR("Object %p already deleted.", obj);
+             return;
+          }
+
         _eo_del_internal(obj);
 
 #ifndef NDEBUG
@@ -1291,7 +1313,10 @@ _eo_unref(Eo *obj)
           }
 #endif
 
-        if (!obj->manual_free) _eo_free(obj);
+        if (!obj->manual_free)
+           _eo_free(obj);
+        else
+           _eo_ref(obj); /* If we manual free, we keep a phantom ref. */
      }
 }
 
@@ -1304,6 +1329,13 @@ eo_unref(const Eo *_obj)
    _eo_unref(obj);
 }
 
+EAPI void
+eo_del(const Eo *obj)
+{
+   eo_parent_set((Eo *) obj, NULL);
+   eo_unref(obj);
+}
+
 EAPI int
 eo_ref_get(const Eo *obj)
 {
@@ -1523,7 +1555,8 @@ eo_composite_object_attach(Eo *obj, Eo *emb_obj)
    EO_MAGIC_RETURN(obj, EO_EINA_MAGIC);
    EO_MAGIC_RETURN(emb_obj, EO_EINA_MAGIC);
 
-   eo_xref(emb_obj, obj);
+   emb_obj->composite = EINA_TRUE;
+   eo_parent_set(emb_obj, obj);
    obj->composite_objects = eina_list_prepend(obj->composite_objects, emb_obj);
 }
 
@@ -1533,8 +1566,9 @@ eo_composite_object_detach(Eo *obj, Eo *emb_obj)
    EO_MAGIC_RETURN(obj, EO_EINA_MAGIC);
    EO_MAGIC_RETURN(emb_obj, EO_EINA_MAGIC);
 
+   emb_obj->composite = EINA_FALSE;
    obj->composite_objects = eina_list_remove(obj->composite_objects, emb_obj);
-   eo_xunref(emb_obj, obj);
+   eo_parent_set(emb_obj, NULL);
 }
 
 EAPI Eina_Bool
@@ -1546,20 +1580,7 @@ eo_composite_is(const Eo *emb_obj)
         return EINA_FALSE;
      }
 
-   Eo *obj = eo_parent_get(emb_obj);
-   Eina_List *itr;
-   Eo *tmp;
-
-   if (!obj)
-      return EINA_FALSE;
-
-   EINA_LIST_FOREACH(obj->composite_objects, itr, tmp)
-     {
-        if (tmp == emb_obj)
-           return EINA_TRUE;
-     }
-
-   return EINA_FALSE;
+   return emb_obj->composite;
 }
 
 EAPI void
@@ -1576,11 +1597,11 @@ eo_manual_free(Eo *obj)
 
    if (EINA_FALSE == obj->manual_free)
      {
-        ERR("Tried manually free the object %p while the option has not been set; see eo_manual_free_set for more information.", obj);
+        ERR("Tried to manually free the object %p while the option has not been set; see eo_manual_free_set for more information.", obj);
         return;
      }
 
-   if (0 != obj->refcount)
+   if (!obj->del)
      {
         ERR("Tried deleting the object %p while still referenced(%d).", obj, eo_ref_get(obj));
         return;