})
#define OP_SUB_ID_GET(op) ((op) & 0xffff)
+#define EOBJ_ALIGN_SIZE(size) \
+ ((size) + (sizeof(void *) - ((size) % sizeof(void *))))
+
/* Structure of Eobj_Op is:
* 16bit: class
* 16bit: op.
const Eobj_Class *klass;
} Eobj_Extension_Node;
+typedef struct
+{
+ const Eobj_Class *klass;
+ size_t offset;
+} Eobj_Extension_Data_Offset;
+
struct _Eobj_Class
{
Eobj_Class_Id class_id;
Dich_Chain1 chain[DICH_CHAIN1_SIZE];
Eina_Inlist *extensions;
+ Eobj_Extension_Data_Offset *extn_data_off;
+ size_t extn_data_size;
+
const Eobj_Class **mro;
size_t data_offset; /* < Offset of the data within object data. */
{
if (!_eobj_op_internal(obj, op, p_list))
{
- const Eobj_Op_Description *desc = _eobj_op_id_desc_get(op);
- const char *_id_name = (desc) ? desc->name : NULL;
const Eobj_Class *op_klass = OP_CLASS_GET(op);
const char *_dom_name = (op_klass) ? op_klass->desc->name : NULL;
ERR("Can't find func for op %x ('%s' of domain '%s') for class '%s'. Aborting.",
- op, _id_name, _dom_name,
+ op, _eobj_op_id_name_get(op), _dom_name,
obj->klass->desc->name);
ret = EINA_FALSE;
break;
va_start(p_list, op);
if (!_eobj_op_internal(obj, op, &p_list))
{
- const Eobj_Op_Description *desc = _eobj_op_id_desc_get(op);
- const char *_id_name = (desc) ? desc->name : NULL;
const Eobj_Class *op_klass = OP_CLASS_GET(op);
const char *_dom_name = (op_klass) ? op_klass->desc->name : NULL;
ERR("Can't find func for op %x ('%s' of domain '%s') for class '%s'. Aborting.",
- op, _id_name, _dom_name,
+ op, _eobj_op_id_name_get(op), _dom_name,
(obj_klass) ? obj_klass->desc->name : NULL);
ret = EINA_FALSE;
}
static Eina_List *
_eobj_class_mro_add(Eina_List *mro, const Eobj_Class *klass)
{
+ Eina_List *extn_pos = NULL;
+ Eina_Bool check_consistency = !mro;
if (!klass)
return mro;
mro = eina_list_append(mro, klass);
+ /* Recursively add extenions. */
{
Eobj_Extension_Node *extn;
EINA_INLIST_FOREACH(klass->extensions, extn)
{
mro = _eobj_class_mro_add(mro, extn->klass);
+ if (!mro)
+ return NULL;
+
+ if (check_consistency)
+ {
+ extn_pos = eina_list_append(extn_pos, eina_list_last(mro));
+ }
+ }
+ }
+
+ /* Check if we can create a consistent mro. We only do it for the class
+ * we are working on (i.e no parents). */
+ if (check_consistency)
+ {
+ Eobj_Extension_Node *extn;
+
+ Eina_List *itr = extn_pos;
+ EINA_INLIST_FOREACH(klass->extensions, extn)
+ {
+ /* Get the first one after the extension. */
+ Eina_List *extn_list = eina_list_next(eina_list_data_get(itr));
+
+ /* If we found the extension again. */
+ if (eina_list_data_find_list(extn_list, extn->klass))
+ {
+ eina_list_free(mro);
+ ERR("Cannot create a consistent method resolution order for class '%s' because of '%s'.", klass->desc->name, extn->klass->desc->name);
+ return NULL;
+ }
+
+ itr = eina_list_next(itr);
}
}
+
mro = _eobj_class_mro_add(mro, klass->parent);
return mro;
}
-static void
+static Eina_Bool
_eobj_class_mro_init(Eobj_Class *klass)
{
Eina_List *mro = NULL;
DBG("Started creating MRO for class '%s'", klass->desc->name);
mro = _eobj_class_mro_add(mro, klass);
+ if (!mro)
+ return EINA_FALSE;
+
+ /* Remove duplicates and make them the right order. */
{
Eina_List *itr1, *itr2, *itr2n;
}
DBG("Finished creating MRO for class '%s'", klass->desc->name);
+
+ return EINA_TRUE;
}
static void
if (klass->desc->class_constructor)
klass->desc->class_constructor(klass);
-
- _eobj_class_mro_init(klass);
}
EAPI void
}
}
- free(klass->mro);
+ if (klass->mro)
+ free(klass->mro);
+
+ if (klass->extn_data_off)
+ free(klass->extn_data_off);
free(klass);
}
/* Update the current offset. */
/* FIXME: Make sure this alignment is enough. */
klass->data_offset = klass->parent->data_offset +
- klass->parent->desc->data_size +
- (sizeof(void *) -
- (klass->parent->desc->data_size % sizeof(void *)));
+ EOBJ_ALIGN_SIZE(klass->parent->desc->data_size);
}
if (!_eobj_class_check_op_descs(klass))
goto cleanup;
}
+ if (!_eobj_class_mro_init(klass))
+ {
+ goto cleanup;
+ }
+
+ /* create MIXIN offset table. */
+ {
+ const Eobj_Class **mro_itr = klass->mro;
+ Eobj_Extension_Data_Offset *extn_data_itr;
+ size_t extn_num = 0;
+ size_t extn_data_off = klass->data_offset +
+ EOBJ_ALIGN_SIZE(klass->desc->data_size);
+
+ /* FIXME: Make faster... */
+ while (*mro_itr)
+ {
+ if (((*mro_itr)->desc->type == EOBJ_CLASS_TYPE_MIXIN) &&
+ ((*mro_itr)->desc->data_size > 0))
+ {
+ extn_num++;
+ }
+ mro_itr++;
+ }
+
+ klass->extn_data_off = calloc(extn_num + 1,
+ sizeof(*klass->extn_data_off));
+
+ extn_data_itr = klass->extn_data_off;
+ mro_itr = klass->mro;
+ while (*mro_itr)
+ {
+ if (((*mro_itr)->desc->type == EOBJ_CLASS_TYPE_MIXIN) &&
+ ((*mro_itr)->desc->data_size > 0))
+ {
+ extn_data_itr->klass = *mro_itr;
+ extn_data_itr->offset = extn_data_off;
+
+ extn_data_off += EOBJ_ALIGN_SIZE(extn_data_itr->klass->desc->data_size);
+ extn_data_itr++;
+ }
+ mro_itr++;
+ }
+
+ klass->extn_data_size = extn_data_off;
+ }
+
klass->class_id = ++_eobj_classes_last_id;
{
/* FIXME: Handle errors. */
obj->refcount++;
- obj->data_blob = calloc(1, klass->data_offset + klass->desc->data_size);
+ 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);
/* FIXME: Add a check that this is of the right klass and we don't seg.
* Probably just return NULL. */
if (klass->desc->data_size > 0)
- return ((char *) obj->data_blob) + klass->data_offset;
- else
- return NULL;
+ {
+ if (klass->desc->type == EOBJ_CLASS_TYPE_MIXIN)
+ {
+ Eobj_Extension_Data_Offset *doff_itr =
+ eobj_class_get(obj)->extn_data_off;
+
+ if (!doff_itr)
+ return NULL;
+
+ while (doff_itr->klass)
+ {
+ if (doff_itr->klass == klass)
+ return ((char *) obj->data_blob) + doff_itr->offset;
+ doff_itr++;
+ }
+ }
+ else
+ {
+ return ((char *) obj->data_blob) + klass->data_offset;
+ }
+ }
+
+ return NULL;
}
EAPI Eina_Bool
EINA_INLIST_FOREACH(obj->callbacks, cb)
{
- if (!cb->delete_me && (cb->event == desc))
+ if (!cb->delete_me && (cb->event == desc))
{
/* Abort callback calling if the func says so. */
if (!cb->func((void *) cb->func_data, obj, desc,
projects / profile / ivi / eobj.git / blobdiff