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

ecore: allow for possible factorization of all idler event.

This commit is contained in:
Cedric BAIL 2016-04-21 13:40:33 -07:00
parent 3ff21c021d
commit 7c62154d52
3 changed files with 45 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/ecore/Ecore_Common.h
View File

@ -3033,7 +3033,7 @@ EAPI char *ecore_timer_dump(void);
/*
* @since 1.8
*/
typedef struct _Ecore_Idler Ecore_Idler; /**< A handle for idlers */
typedef struct _Ecore_Factorized_Idle Ecore_Idler; /**< A handle for idlers */
/*
* @since 1.8

61
src/lib/ecore/ecore_idler.c
View File

@ -9,56 +9,54 @@
#include "Ecore.h"
#include "ecore_private.h"
struct _Ecore_Idler
struct _Ecore_Factorized_Idle
{
Ecore_Task_Cb func;
void *data;
const Eo_Callback_Array_Item *desc;
};
static void *_ecore_idler_del(Ecore_Idler *idler);
static Eina_Bool
_ecore_idler_event_del(void *data, const Eo_Event *event EINA_UNUSED)
Eina_Bool
_ecore_factorized_idle_event_del(void *data, const Eo_Event *event EINA_UNUSED)
{
_ecore_idler_del(data);
_ecore_factorized_idle_del(data);
return EO_CALLBACK_CONTINUE;
}
static Eina_Bool
_ecore_idler_process(void *data, const Eo_Event *event EINA_UNUSED)
Eina_Bool
_ecore_factorized_idle_process(void *data, const Eo_Event *event EINA_UNUSED)
{
Ecore_Idler *idler = data;
Ecore_Factorized_Idle *idler = data;
if (!_ecore_call_task_cb(idler->func, idler->data))
_ecore_idler_del(idler);
_ecore_factorized_idle_del(idler);
return EO_CALLBACK_CONTINUE;
}
EO_CALLBACKS_ARRAY_DEFINE(ecore_idler_callbacks,
{ ECORE_MAINLOOP_EVENT_IDLE, _ecore_idler_process },
{ EO_BASE_EVENT_DEL, _ecore_idler_event_del });
static void *
_ecore_idler_del(Ecore_Idler *idler)
void *
_ecore_factorized_idle_del(Ecore_Idler *idler)
{
void *data;
if (!idler) return NULL;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
eo_event_callback_array_del(_mainloop_singleton, ecore_idler_callbacks(), idler);
eo_event_callback_array_del(_mainloop_singleton, idler->desc, idler);
data = idler->data;
free(idler);
return data;
}
EAPI Ecore_Idler *
ecore_idler_add(Ecore_Task_Cb func,
const void *data)
Ecore_Factorized_Idle *
_ecore_factorized_idle_add(const Eo_Callback_Array_Item *desc,
Ecore_Task_Cb func,
const void *data)
{
Ecore_Idler *ret;
Ecore_Factorized_Idle *ret;
if (EINA_UNLIKELY(!eina_main_loop_is()))
{
@ -76,19 +74,30 @@ ecore_idler_add(Ecore_Task_Cb func,
ret->func = func;
ret->data = (void*) data;
ret->desc = desc;
eo_event_callback_array_add(_mainloop_singleton, ecore_idler_callbacks(), ret);
eo_event_callback_array_add(_mainloop_singleton, desc, ret);
return ret;
}
/* Specific to Ecore_Idler implementation */
EO_CALLBACKS_ARRAY_DEFINE(ecore_idler_callbacks,
{ ECORE_MAINLOOP_EVENT_IDLE, _ecore_factorized_idle_process },
{ EO_BASE_EVENT_DEL, _ecore_factorized_idle_event_del });
EAPI Ecore_Idler *
ecore_idler_add(Ecore_Task_Cb func,
const void *data)
{
return _ecore_factorized_idle_add(ecore_idler_callbacks(), func, data);
}
EAPI void *
ecore_idler_del(Ecore_Idler *idler)
{
if (!idler) return NULL;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
return _ecore_idler_del(idler);
return _ecore_factorized_idle_del(idler);
}
void

9
src/lib/ecore/ecore_private.h
View File

@ -85,6 +85,8 @@ extern int _ecore_log_dom;
# define CLAMP(x, min, max) (((x) > (max)) ? (max) : (((x) < (min)) ? (min) : (x)))
#endif
typedef struct _Ecore_Factorized_Idle Ecore_Factorized_Idle;
typedef struct _Ecore_Mainloop_Data Ecore_Mainloop_Data;
struct _Ecore_Mainloop_Data
{
@ -171,6 +173,13 @@ int _ecore_timers_exists(void);
int _ecore_timer_expired_call(double when);
Ecore_Factorized_Idle *_ecore_factorized_idle_add(const Eo_Callback_Array_Item*desc,
Ecore_Task_Cb func,
const void *data);
void *_ecore_factorized_idle_del(Ecore_Idler *idler);
Eina_Bool _ecore_factorized_idle_process(void *data, const Eo_Event *event);
Eina_Bool _ecore_factorized_idle_event_del(void *data, const Eo_Event *event);
void _ecore_idler_all_call(Eo *loop);
int _ecore_idler_exist(Eo *loop);