Eo: adapt benchmarks to Eo2.

This commit is contained in:
Daniel Zaoui 2014-04-23 11:23:39 +03:00
parent 026d7210c6
commit 3c61dc1dba
3 changed files with 11 additions and 48 deletions

View File

@ -7,42 +7,28 @@
#define MY_CLASS SIMPLE_CLASS
EAPI Eo_Op SIMPLE_BASE_ID = 0;
static void
_a_set(Eo *obj EINA_UNUSED, void *class_data, va_list *list)
_a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
{
Simple_Public_Data *pd = class_data;
int a;
a = va_arg(*list, int);
pd->a = a;
}
static void
_class_constructor(Eo_Class *klass)
{
const Eo_Op_Func_Description func_desc[] = {
EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set),
EO_OP_FUNC_SENTINEL
};
EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
eo_class_funcs_set(klass, func_desc);
}
static const Eo_Op_Description op_desc[] = {
EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "Set property A"),
EO_OP_DESCRIPTION_SENTINEL
static Eo_Op_Description op_desc[] = {
EO_OP_FUNC(simple_a_set, _a_set, "Set property A"),
EO_OP_SENTINEL
};
static const Eo_Class_Description class_desc = {
EO_VERSION,
"Simple",
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(&SIMPLE_BASE_ID, op_desc, SIMPLE_SUB_ID_LAST),
EO_CLASS_DESCRIPTION_OPS(op_desc),
NULL,
sizeof(Simple_Public_Data),
_class_constructor,
NULL,
NULL
};

View File

@ -1,21 +1,12 @@
#ifndef SIMPLE_H
#define SIMPLE_H
extern EAPI Eo_Op SIMPLE_BASE_ID;
enum {
SIMPLE_SUB_ID_A_SET,
SIMPLE_SUB_ID_LAST
};
typedef struct
{
int a;
} Simple_Public_Data;
#define SIMPLE_ID(sub_id) (SIMPLE_BASE_ID + sub_id)
#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EO_TYPECHECK(int, a)
EAPI void simple_a_set(int a);
#define SIMPLE_CLASS simple_class_get()
const Eo_Class *simple_class_get(void);

View File

@ -22,25 +22,11 @@ bench_eo_do_general(int request)
static const Eo_Class *cur_klass;
static void
_a_set(Eo *obj, void *class_data EINA_UNUSED, va_list *list)
_a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
{
int a;
a = va_arg(*list, int);
eo_do_super(obj, cur_klass, simple_a_set(a));
}
static void
_class_constructor(Eo_Class *klass)
{
const Eo_Op_Func_Description func_desc[] = {
EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set),
EO_OP_FUNC_SENTINEL
};
eo_class_funcs_set(klass, func_desc);
}
static void
bench_eo_do_super(int request)
{
@ -48,10 +34,10 @@ bench_eo_do_super(int request)
EO_VERSION,
"Simple2",
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(NULL, NULL, 0),
EO_CLASS_DESCRIPTION_NOOPS(),
NULL,
0,
_class_constructor,
NULL,
NULL
};
cur_klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL);