From 9dc0a15499578b618f8900981d735f2207102e5f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Fri, 17 Feb 2017 18:37:03 +0900 Subject: eo: Make _eo_obj_pointer_done an inline function @optimization --- src/lib/eo/eo_private.h | 1 - src/lib/eo/eo_ptr_indirection.c | 11 ----------- src/lib/eo/eo_ptr_indirection.x | 11 +++++++++++ 3 files changed, 11 insertions(+), 12 deletions(-) (limited to 'src/lib/eo') diff --git a/src/lib/eo/eo_private.h b/src/lib/eo/eo_private.h index 658c79f7fe..84974da7d5 100644 --- a/src/lib/eo/eo_private.h +++ b/src/lib/eo/eo_private.h @@ -214,7 +214,6 @@ Eo *_eo_header_id_get(const Eo_Header *header) /* Retrieves the pointer to the object from the id */ _Eo_Object *_eo_obj_pointer_get(const Eo_Id obj_id, const char *func_name, const char *file, int line); -void _eo_obj_pointer_done(const Eo_Id obj_id); static inline Efl_Class *_eo_class_id_get(const _Efl_Class *klass) diff --git a/src/lib/eo/eo_ptr_indirection.c b/src/lib/eo/eo_ptr_indirection.c index 9d7031e1e1..86ad204666 100644 --- a/src/lib/eo/eo_ptr_indirection.c +++ b/src/lib/eo/eo_ptr_indirection.c @@ -203,14 +203,3 @@ err: return (_Eo_Object *) obj_id; #endif } - -void -_eo_obj_pointer_done(const Eo_Id obj_id) -{ -#ifdef HAVE_EO_ID - Efl_Id_Domain domain = (obj_id >> SHIFT_DOMAIN) & MASK_DOMAIN; - if (EINA_LIKELY(domain != EFL_ID_DOMAIN_SHARED)) return; - eina_lock_release(&(_eo_table_data_shared_data->obj_lock)); -#endif - (void)obj_id; -} diff --git a/src/lib/eo/eo_ptr_indirection.x b/src/lib/eo/eo_ptr_indirection.x index 5e0f7bf376..ef3c0e0cb5 100644 --- a/src/lib/eo/eo_ptr_indirection.x +++ b/src/lib/eo/eo_ptr_indirection.x @@ -366,6 +366,17 @@ _eo_id_domain_compatible(const Eo *o1, const Eo *o2) return EINA_FALSE; } +static inline void +_eo_obj_pointer_done(const Eo_Id obj_id) +{ +#ifdef HAVE_EO_ID + Efl_Id_Domain domain = (obj_id >> SHIFT_DOMAIN) & MASK_DOMAIN; + if (EINA_LIKELY(domain != EFL_ID_DOMAIN_SHARED)) return; + eina_lock_release(&(_eo_table_data_shared_data->obj_lock)); +#endif + (void)obj_id; +} + ////////////////////////////////////////////////////////////////////////// -- cgit v1.2.1