[EGIT] [core/efl] master 03/03: eo - move cache lookup into the hot path if as it only is valid there

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=c2b4137f774f9123a2955cd4f41bf9a496117074

commit c2b4137f774f9123a2955cd4f41bf9a496117074
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Sat Oct 24 12:23:53 2015 +0900

    eo - move cache lookup into the hot path if as it only is valid there
    
    minor speedup ... really minor - but correct.
---
 src/lib/eo/eo.c | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 89bc56b..22120cd 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -538,7 +538,7 @@ _eo_call_resolve(const char *func_name, Eo_Op_Call_Data 
*call, Eo_Call_Cache *ca
 
    inputklass = klass = (is_obj) ? fptr->o.obj->klass : fptr->o.kls;
 
-   if (cache->op == EO_NOOP)
+   if (!cache->op)
      {
         ERR("%s:%d: unable to resolve %s api func '%s' in class '%s'.",
             file, line, (!is_obj ? "class" : "regular"),
@@ -547,9 +547,19 @@ _eo_call_resolve(const char *func_name, Eo_Op_Call_Data 
*call, Eo_Call_Cache *ca
         return EINA_FALSE;
      }
 
-# if EO_CALL_CACHE_SIZE > 0
-   if (!fptr->cur_klass)
+   /* If we have a current class, we need to itr to the next. */
+   if (fptr->cur_klass)
      {
+        func = _eo_kls_itr_next(klass, fptr->cur_klass, cache->op);
+
+        if (!func)
+          goto end;
+
+        klass = func->src;
+     }
+   else
+     {
+# if EO_CALL_CACHE_SIZE > 0
 # if EO_CALL_CACHE_SIZE > 1
         int i;
 
@@ -582,21 +592,8 @@ _eo_call_resolve(const char *func_name, Eo_Op_Call_Data 
*call, Eo_Call_Cache *ca
                   return EINA_TRUE;
                }
           }
-     }
 #endif
 
-   /* If we have a current class, we need to itr to the next. */
-   if (fptr->cur_klass)
-     {
-        func = _eo_kls_itr_next(klass, fptr->cur_klass, cache->op);
-
-        if (!func)
-          goto end;
-
-        klass = func->src;
-     }
-   else
-     {
         func = _dich_func_get(klass, cache->op);
 
         if (!func)

--