vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eo: Move op resolve check to where it belongs (out of hot path). 

It was put in the wrong place. It should abort early if it detects we
can't resolve, and shouldn't check it if we already know it's OK.
This commit is contained in:
Tom Hacohen 2015-10-15 18:03:27 +01:00
parent 9686e44b92
commit f28f6ecbfa
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/eo/Eo.h
View File

@ -484,8 +484,11 @@ typedef struct _Eo_Call_Cache
#define EO_FUNC_COMMON_OP(Name, DefRet) \
static Eo_Call_Cache ___cache; /* static 0 by default */ \
Eo_Op_Call_Data ___call; \
if (___cache.op == EO_NOOP) \
___cache.op = _eo_api_op_id_get(EO_FUNC_COMMON_OP_FUNC(Name)); \
if (EINA_UNLIKELY(___cache.op == EO_NOOP)) \
{ \
___cache.op = _eo_api_op_id_get(EO_FUNC_COMMON_OP_FUNC(Name)); \
if (___cache.op == EO_NOOP) return DefRet; \
} \
if (!_eo_call_resolve(#Name, &___call, &___cache, \
__FILE__, __LINE__)) return DefRet; \
_Eo_##Name##_func _func_ = (_Eo_##Name##_func) ___call.func; \

5
src/lib/eo/eo.c
View File

@ -743,6 +743,11 @@ _eo_api_op_id_get(const void *api_func)
#endif
eina_spinlock_release(&_ops_storage_lock);
if (op == EO_NOOP)
{
ERR("Unable to resolve op for api func %p", api_func);
}
return op;
}

2
src/tests/eo/suite/eo_test_call_errors.c
View File

@ -37,7 +37,7 @@ START_TEST(eo_api_not_implemented_call)
Eo *obj = eo_add(SIMPLE_CLASS, NULL);
fail_if(!obj);
TEST_EO_ERROR("_eo_call_resolve", "%s:%d: unable to resolve %s api func '%s' in class '%s'.");
TEST_EO_ERROR("_eo_api_op_id_get", "Unable to resolve op for api func %p");
eo_do(obj, simple_no_implementation());
fail_unless(ctx.did);