enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Eobj: Allocate the data blob at the end of the object. 

This replaces the obj->data_blob pointer. Hopefully will be better.

SVN revision: 70405
This commit is contained in:
Tom Hacohen 2012-04-23 08:09:45 +00:00
parent 84a698c972
commit a5742a341c
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
legacy/eobj/lib/eobj.c
View File

@ -24,7 +24,6 @@ struct _Eobj {
EINA_MAGIC
Eobj *parent;
const Eobj_Class *klass;
void *data_blob;
int refcount;
#ifndef NDEBUG
Eina_Inlist *xrefs;
@ -848,15 +847,14 @@ eobj_add(const Eobj_Class *klass, Eobj *parent)
return NULL;
}
Eobj *obj = calloc(1, sizeof(*obj));
Eobj *obj = calloc(1, EOBJ_ALIGN_SIZE(sizeof(*obj)) +
(klass->data_offset + EOBJ_ALIGN_SIZE(klass->desc->data_size)) +
klass->extn_data_size);
obj->klass = klass;
obj->parent = parent;
obj->refcount++;
obj->data_blob = calloc(1, klass->data_offset + klass->desc->data_size +
klass->extn_data_size);
_eobj_kls_itr_init(obj, EOBJ_NOOP);
eobj_constructor_error_unset(obj);
@ -1012,9 +1010,6 @@ eobj_unref(Eobj *obj)
_eobj_callback_remove_all(obj);
if (obj->data_blob)
free(obj->data_blob);
free(obj);
}
}
@ -1160,13 +1155,15 @@ eobj_data_get(const Eobj *obj, const Eobj_Class *klass)
while (doff_itr->klass)
{
if (doff_itr->klass == klass)
return ((char *) obj->data_blob) + doff_itr->offset;
return ((char *) obj) + EOBJ_ALIGN_SIZE(sizeof(*obj)) +
doff_itr->offset;
doff_itr++;
}
}
else
{
return ((char *) obj->data_blob) + klass->data_offset;
return ((char *) obj) + EOBJ_ALIGN_SIZE(sizeof(*obj)) +
klass->data_offset;
}
}