enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Porting to Eo: Job, Animator, Idler, Idle_Enterer, Idle_Exiter, Timer, Ecore_Poll 

Signed-off-by: Yakov Goldberg <yakov.g@samsung.com>

SVN revision: 77722
This commit is contained in:
Yakov Goldberg 2012-10-10 08:19:58 +00:00 committed by Daniel Zaoui
parent fa1dd2b86f
commit dbda81582a
16 changed files with 1437 additions and 460 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
legacy/ecore/ChangeLog
View File

@ -1,3 +1,6 @@
2012-10-10 Daniel Zaoui and Yaakov Goldberg
* Porting of Ecore to Eo
2011-01-29 Carsten Haitzler (The Rasterman) 2011-01-29 Carsten Haitzler (The Rasterman)
1.0.0 release 1.0.0 release

2
legacy/ecore/NEWS
View File

@ -4,6 +4,8 @@ Changes since Ecore 1.7.0:
-------------------------- --------------------------
Additions: Additions:
* ecore:
- porting to Eo
* ecore_con: * ecore_con:
- Add Ecore_Con_Eet API to help using Eet_Data with Ecore_Con. - Add Ecore_Con_Eet API to help using Eet_Data with Ecore_Con.
* ecore_x: * ecore_x:

7
legacy/ecore/configure.ac
View File

@ -565,6 +565,13 @@ requirements_ecore_win32="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_wi
requirements_ecore_wince="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_wince}" requirements_ecore_wince="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_wince}"
requirements_ecore_x="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_x}" requirements_ecore_x="ecore >= 1.6.99 eina >= 1.6.99 ${requirements_ecore_x}"
# Eo
PKG_CHECK_MODULES([EO], [eo])
requirements_ecore="eo ${requirements_ecore}"
EINA_CFLAGS="$EINA_CFLAGS $EO_CFLAGS"
EINA_LIBS="$EINA_LIBS $EO_LIBS"
# glib support (main loop integration) # glib support (main loop integration)
AC_ARG_ENABLE([glib], AC_ARG_ENABLE([glib],

6
legacy/ecore/src/examples/ecore_idler_example.c
View File

@ -56,7 +56,8 @@ _event_handler_cb(void *data, int type, void *event) // event callback
{ {
ecore_idle_enterer_del(ctxt->enterer); ecore_idle_enterer_del(ctxt->enterer);
ecore_idle_exiter_del(ctxt->exiter); ecore_idle_exiter_del(ctxt->exiter);
ecore_idler_del(ctxt->idler); // ecore_idler_del(ctxt->idler);
eo_unref(ctxt->idler);
ctxt->enterer = NULL; ctxt->enterer = NULL;
ctxt->exiter = NULL; ctxt->exiter = NULL;
@ -101,7 +102,8 @@ main(int argc, char **argv)
ctxt.enterer = ecore_idle_enterer_add(_enterer_cb, &ctxt); ctxt.enterer = ecore_idle_enterer_add(_enterer_cb, &ctxt);
ctxt.exiter = ecore_idle_exiter_add(_exiter_cb, &ctxt); ctxt.exiter = ecore_idle_exiter_add(_exiter_cb, &ctxt);
ctxt.idler = ecore_idler_add(_idler_cb, &ctxt); // ctxt.idler = ecore_idler_add(_idler_cb, &ctxt);
ctxt.idler = eo_add_custom(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(_idler_cb, &ctxt));
ctxt.handler = ecore_event_handler_add(_event_type, ctxt.handler = ecore_event_handler_add(_event_type,
_event_handler_cb, _event_handler_cb,
&ctxt); &ctxt);

35
legacy/ecore/src/examples/ecore_poller_example.c
View File

@ -13,13 +13,22 @@ _poller_print_cb(void *data)
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
} }
static Eina_Bool
_poller_quit_cb(void *data)
{
ecore_main_loop_quit();
return EINA_TRUE;
}
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
double interval = 0.3; // tick each 0.3 seconds double interval = 0.3; // tick each 0.3 seconds
Ecore_Poller *poller1, *poller2; Ecore_Poller *poller1, *poller2, *poller3;
char *str1 = "poller1"; char *str1 = "poller1";
char *str2 = "poller2"; char *str2 = "poller2";
char *str3 = "poller3";
if (!ecore_init()) if (!ecore_init())
{ {
@ -31,18 +40,32 @@ main(int argc, char **argv)
ecore_poller_poll_interval_set(ECORE_POLLER_CORE, interval); ecore_poller_poll_interval_set(ECORE_POLLER_CORE, interval);
poller1 = ecore_poller_add(ECORE_POLLER_CORE, 4, _poller_print_cb, str1); // poller1 = ecore_poller_add(ECORE_POLLER_CORE, 4, _poller_print_cb, str1);
poller2 = ecore_poller_add(ECORE_POLLER_CORE, 8, _poller_print_cb, str2); // poller2 = ecore_poller_add(ECORE_POLLER_CORE, 8, _poller_print_cb, str2);
// poller3 = ecore_poller_add(ECORE_POLLER_CORE, 30, _poller_quit_cb, str3);
poller1 = eo_add_custom(ECORE_POLLER_CLASS, NULL,
ecore_poller_constructor(ECORE_POLLER_CORE, 4, _poller_print_cb, str1));
poller2 = eo_add_custom(ECORE_POLLER_CLASS, NULL,
ecore_poller_constructor(ECORE_POLLER_CORE, 8, _poller_print_cb, str2));
poller3 = eo_add_custom(ECORE_POLLER_CLASS, NULL,
ecore_poller_constructor(ECORE_POLLER_CORE, 20, _poller_quit_cb, str3));
ecore_main_loop_begin(); ecore_main_loop_begin();
printf("changing poller2 interval to 16\n"); printf("changing poller2 interval to 16\n");
ecore_poller_poller_interval_set(poller2, 16); // ecore_poller_poller_interval_set(poller2, 16);
eo_do(poller2, ecore_poller_interval_set(16, NULL));
ecore_main_loop_begin(); ecore_main_loop_begin();
ecore_poller_del(poller1); eo_unref(poller1);
ecore_poller_del(poller2); eo_unref(poller2);
eo_unref(poller3);
// ecore_poller_del(poller1);
// ecore_poller_del(poller2);
// ecore_poller_del(poller3);
ecore_shutdown(); ecore_shutdown();
} }

164
legacy/ecore/src/lib/ecore/Ecore.h
View File

@ -328,6 +328,9 @@ sudo make install
#include <Eina.h> #include <Eina.h>
/* This include has been added to support Eo in Ecore */
#include <Eo.h>
#ifdef EAPI #ifdef EAPI
# undef EAPI # undef EAPI
#endif #endif
@ -1253,7 +1256,31 @@ enum _Ecore_Poller_Type /* Poller types */
}; };
typedef enum _Ecore_Poller_Type Ecore_Poller_Type; typedef enum _Ecore_Poller_Type Ecore_Poller_Type;
typedef struct _Ecore_Poller Ecore_Poller; /**< A handle for pollers */ /*
* @since 1.8
*/
typedef Eo Ecore_Poller; /**< A handle for pollers */
#define ECORE_POLLER_CLASS ecore_poller_class_get()
const Eo_Class *ecore_poller_class_get(void) EINA_CONST;
extern EAPI Eo_Op ECORE_POLLER_BASE_ID;
enum
{
ECORE_POLLER_SUB_ID_CONSTRUCTOR,
ECORE_POLLER_SUB_ID_INTERVAL_SET,
ECORE_POLLER_SUB_ID_INTERVAL_GET,
ECORE_POLLER_SUB_ID_LAST,
};
#define ECORE_POLLER_ID(sub_id) (ECORE_POLLER_BASE_ID + sub_id)
#define ecore_poller_constructor(type, interval, func, data) ECORE_POLLER_ID(ECORE_POLLER_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(Ecore_Poller_Type, type), EO_TYPECHECK(int, interval), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
#define ecore_poller_interval_set(interval, ret) ECORE_POLLER_ID(ECORE_POLLER_SUB_ID_INTERVAL_SET), EO_TYPECHECK(int, interval), EO_TYPECHECK(Eina_Bool *, ret)
#define ecore_poller_interval_get(ret) ECORE_POLLER_ID(ECORE_POLLER_SUB_ID_INTERVAL_GET), EO_TYPECHECK(int *, ret)
/** /**
* @brief Sets the time(in seconds) between ticks for the given poller type. * @brief Sets the time(in seconds) between ticks for the given poller type.
@ -1368,7 +1395,27 @@ EAPI void *ecore_poller_del(Ecore_Poller *poller);
* @{ * @{
*/ */
typedef struct _Ecore_Animator Ecore_Animator; /**< A handle for animators */ /*
* @since 1.8
*/
typedef Eo Ecore_Animator; /**< A handle for animators */
#define ECORE_ANIMATOR_CLASS ecore_animator_class_get()
const Eo_Class *ecore_animator_class_get(void) EINA_CONST;
extern EAPI Eo_Op ECORE_ANIMATOR_BASE_ID;
enum
{
ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR,
ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR,
ECORE_ANIMATOR_SUB_ID_LAST
};
#define ECORE_ANIMATOR_ID(sub_id) (ECORE_ANIMATOR_BASE_ID + sub_id)
#define ecore_animator_constructor(func, data) ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
#define ecore_animator_timeline_constructor(runtime, func, data) ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR), EO_TYPECHECK(double, runtime), EO_TYPECHECK(Ecore_Timeline_Cb, func), EO_TYPECHECK(const void *, data)
/** /**
* @enum _Ecore_Pos_Map * @enum _Ecore_Pos_Map
@ -1711,7 +1758,37 @@ EAPI double ecore_loop_time_get(void);
* @{ * @{
*/ */
typedef struct _Ecore_Timer Ecore_Timer; /**< A handle for timers */ /*
* @since 1.8
*/
typedef Eo Ecore_Timer; /**< A handle for timers */
#define ECORE_TIMER_CLASS ecore_timer_class_get()
const Eo_Class *ecore_timer_class_get(void) EINA_CONST;
extern EAPI Eo_Op ECORE_TIMER_BASE_ID;
enum
{
ECORE_TIMER_SUB_ID_CONSTRUCTOR,
ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR,
ECORE_TIMER_SUB_ID_INTERVAL_SET,
ECORE_TIMER_SUB_ID_INTERVAL_GET,
ECORE_TIMER_SUB_ID_DELAY,
ECORE_TIMER_SUB_ID_RESET,
ECORE_TIMER_SUB_ID_PENDING_GET,
ECORE_TIMER_SUB_ID_LAST,
};
#define ECORE_TIMER_ID(sub_id) (ECORE_TIMER_BASE_ID + sub_id)
#define ecore_timer_constructor(in, func, data) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(double, in), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
#define ecore_timer_loop_constructor(in, func, data) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR), EO_TYPECHECK(double, in), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
#define ecore_obj_timer_interval_set(in) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_SET), EO_TYPECHECK(double, in)
#define ecore_obj_timer_interval_get(ret) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_GET), EO_TYPECHECK(double *, ret)
#define ecore_obj_timer_delay(add) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_DELAY), EO_TYPECHECK(double, add)
#define ecore_obj_timer_reset() ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_RESET)
#define ecore_obj_timer_pending_get(ret) ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_PENDING_GET), EO_TYPECHECK(double *, ret)
EAPI Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void *data); EAPI Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void *data);
EAPI Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data); EAPI Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data);
@ -1776,9 +1853,66 @@ EAPI char *ecore_timer_dump(void);
* @{ * @{
*/ */
typedef struct _Ecore_Idler Ecore_Idler; /**< A handle for idlers */ /*
typedef struct _Ecore_Idle_Enterer Ecore_Idle_Enterer; /**< A handle for idle enterers */ * @since 1.8
typedef struct _Ecore_Idle_Exiter Ecore_Idle_Exiter; /**< A handle for idle exiters */ */
typedef Eo Ecore_Idler; /**< A handle for idlers */
#define ECORE_IDLER_CLASS ecore_idler_class_get()
const Eo_Class *ecore_idler_class_get(void) EINA_CONST;
extern EAPI Eo_Op ECORE_IDLER_BASE_ID;
enum
{
ECORE_IDLER_SUB_ID_CONSTRUCTOR,
ECORE_IDLER_SUB_ID_LAST
};
#define ECORE_IDLER_ID(sub_id) (ECORE_IDLER_BASE_ID + sub_id)
#define ecore_idler_constructor(func, data) ECORE_IDLER_ID(ECORE_IDLER_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
/**
*
*/
typedef Eo Ecore_Idle_Enterer; /**< A handle for idle enterers */
#define ECORE_IDLE_ENTERER_CLASS ecore_idle_enterer_class_get()
const Eo_Class *ecore_idle_enterer_class_get(void) EINA_CONST;
extern EAPI Eo_Op ECORE_IDLE_ENTERER_BASE_ID;
enum
{
ECORE_IDLE_ENTERER_SUB_ID_AFTER_CONSTRUCTOR,
ECORE_IDLE_ENTERER_SUB_ID_BEFORE_CONSTRUCTOR,
ECORE_IDLE_ENTERER_SUB_ID_LAST
};
#define ECORE_IDLE_ENTERER_ID(sub_id) (ECORE_IDLE_ENTERER_BASE_ID + sub_id)
#define ecore_idle_enterer_after_constructor(func, data) ECORE_IDLE_ENTERER_ID(ECORE_IDLE_ENTERER_SUB_ID_AFTER_CONSTRUCTOR), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
#define ecore_idle_enterer_before_constructor(func, data) ECORE_IDLE_ENTERER_ID(ECORE_IDLE_ENTERER_SUB_ID_BEFORE_CONSTRUCTOR), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
/**
*
*/
/*
* @since 1.8
*/
typedef Eo Ecore_Idle_Exiter; /**< A handle for idle exiters */
#define ECORE_IDLE_EXITER_CLASS ecore_idle_exiter_class_get()
const Eo_Class *ecore_idle_exiter_class_get(void) EINA_CONST;
extern EAPI Eo_Op ECORE_IDLE_EXITER_BASE_ID;
enum
{
ECORE_IDLE_EXITER_SUB_ID_CONSTRUCTOR,
ECORE_IDLE_EXITER_SUB_ID_LAST
};
#define ECORE_IDLE_EXITER_ID(sub_id) (ECORE_IDLE_EXITER_BASE_ID + sub_id)
#define ecore_idle_exiter_constructor(func, data) ECORE_IDLE_EXITER_ID(ECORE_IDLE_EXITER_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
/** /**
* Add an idler handler. * Add an idler handler.
@ -2575,7 +2709,23 @@ EAPI int ecore_pipe_wait(Ecore_Pipe *p, int message_count, double wait);
* @{ * @{
*/ */
typedef struct _Ecore_Job Ecore_Job; /**< A job handle */ /*
* @since 1.8
*/
typedef Eo Ecore_Job; /**< A job handle */
#define ECORE_JOB_CLASS ecore_job_class_get()
const Eo_Class *ecore_job_class_get(void) EINA_CONST;
extern EAPI Eo_Op ECORE_JOB_BASE_ID;
enum
{
ECORE_JOB_SUB_ID_CONSTRUCTOR,
ECORE_JOB_SUB_ID_LAST
};
#define ECORE_JOB_ID(sub_id) (ECORE_JOB_BASE_ID + sub_id)
#define ecore_job_constructor(func, data) ECORE_JOB_ID(ECORE_JOB_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(Ecore_Cb, func), EO_TYPECHECK(const void *, data)
EAPI Ecore_Job *ecore_job_add(Ecore_Cb func, const void *data); EAPI Ecore_Job *ecore_job_add(Ecore_Cb func, const void *data);
EAPI void *ecore_job_del(Ecore_Job *job); EAPI void *ecore_job_del(Ecore_Job *job);

24
legacy/ecore/src/lib/ecore/ecore.c
View File

@ -36,6 +36,9 @@
#if HAVE_MALLINFO #if HAVE_MALLINFO
#include <malloc.h> #include <malloc.h>
EAPI Eo *_ecore_parent = NULL;
static Ecore_Version _version = { VERS_MAJ, VERS_MIN, VERS_MIC, VERS_REV }; static Ecore_Version _version = { VERS_MAJ, VERS_MIN, VERS_MIC, VERS_REV };
EAPI Ecore_Version *ecore_version = &_version; EAPI Ecore_Version *ecore_version = &_version;
@ -138,6 +141,8 @@ ecore_init(void)
if (++_ecore_init_count != 1) if (++_ecore_init_count != 1)
return _ecore_init_count; return _ecore_init_count;
eo_init();
#ifdef HAVE_LOCALE_H #ifdef HAVE_LOCALE_H
setlocale(LC_CTYPE, ""); setlocale(LC_CTYPE, "");
#endif #endif
@ -194,6 +199,7 @@ ecore_init(void)
#if defined(GLIB_INTEGRATION_ALWAYS) #if defined(GLIB_INTEGRATION_ALWAYS)
if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate(); if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate();
#endif #endif
_ecore_parent = eo_add(ECORE_PARENT_CLASS, NULL);
return _ecore_init_count; return _ecore_init_count;
@ -205,6 +211,9 @@ shutdown_evil:
#ifdef HAVE_EVIL #ifdef HAVE_EVIL
evil_shutdown(); evil_shutdown();
#endif #endif
eo_shutdown();
return --_ecore_init_count; return --_ecore_init_count;
} }
@ -299,6 +308,9 @@ ecore_shutdown(void)
#ifdef HAVE_EVIL #ifdef HAVE_EVIL
evil_shutdown(); evil_shutdown();
#endif #endif
eo_unref(_ecore_parent);
eo_shutdown();
unlock: unlock:
_ecore_unlock(); _ecore_unlock();
@ -852,3 +864,15 @@ _thread_callback(void *data __UNUSED__,
_ecore_main_call_flush(); _ecore_main_call_flush();
} }
static const Eo_Class_Description parent_class_desc = {
EO_VERSION,
"ecore_parent",
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(NULL, NULL, 0),
NULL,
0,
NULL,
NULL
};
EO_DEFINE_CLASS(ecore_parent_class_get, &parent_class_desc, EO_BASE_CLASS, NULL);

42
legacy/ecore/src/lib/ecore/ecore_alloc.c
View File

@ -32,16 +32,16 @@ struct _Ecore_Mempool
eina_mempool_free(Type##_mp.mp, e); \ eina_mempool_free(Type##_mp.mp, e); \
} }
GENERIC_ALLOC_FREE(Ecore_Animator, ecore_animator); //GENERIC_ALLOC_FREE(Ecore_Animator, ecore_animator);
GENERIC_ALLOC_FREE(Ecore_Event_Handler, ecore_event_handler); GENERIC_ALLOC_FREE(Ecore_Event_Handler, ecore_event_handler);
GENERIC_ALLOC_FREE(Ecore_Event_Filter, ecore_event_filter); GENERIC_ALLOC_FREE(Ecore_Event_Filter, ecore_event_filter);
GENERIC_ALLOC_FREE(Ecore_Event, ecore_event); GENERIC_ALLOC_FREE(Ecore_Event, ecore_event);
GENERIC_ALLOC_FREE(Ecore_Idle_Exiter, ecore_idle_exiter); //GENERIC_ALLOC_FREE(Ecore_Idle_Exiter, ecore_idle_exiter);
GENERIC_ALLOC_FREE(Ecore_Idle_Enterer, ecore_idle_enterer); //GENERIC_ALLOC_FREE(Ecore_Idle_Enterer, ecore_idle_enterer);
GENERIC_ALLOC_FREE(Ecore_Idler, ecore_idler); //GENERIC_ALLOC_FREE(Ecore_Idler, ecore_idler);
GENERIC_ALLOC_FREE(Ecore_Job, ecore_job); //GENERIC_ALLOC_FREE(Ecore_Job, ecore_job);
GENERIC_ALLOC_FREE(Ecore_Timer, ecore_timer); //GENERIC_ALLOC_FREE(Ecore_Timer, ecore_timer);
GENERIC_ALLOC_FREE(Ecore_Poller, ecore_poller); //GENERIC_ALLOC_FREE(Ecore_Poller, ecore_poller);
GENERIC_ALLOC_FREE(Ecore_Pipe, ecore_pipe); GENERIC_ALLOC_FREE(Ecore_Pipe, ecore_pipe);
GENERIC_ALLOC_FREE(Ecore_Fd_Handler, ecore_fd_handler); GENERIC_ALLOC_FREE(Ecore_Fd_Handler, ecore_fd_handler);
#ifdef _WIN32 #ifdef _WIN32
@ -49,16 +49,16 @@ GENERIC_ALLOC_FREE(Ecore_Win32_Handler, ecore_win32_handler);
#endif #endif
static Ecore_Mempool *mempool_array[] = { static Ecore_Mempool *mempool_array[] = {
&ecore_animator_mp, // &ecore_animator_mp,
&ecore_event_handler_mp, &ecore_event_handler_mp,
&ecore_event_filter_mp, &ecore_event_filter_mp,
&ecore_event_mp, &ecore_event_mp,
&ecore_idle_exiter_mp, // &ecore_idle_exiter_mp,
&ecore_idle_enterer_mp, // &ecore_idle_enterer_mp,
&ecore_idler_mp, // &ecore_idler_mp,
&ecore_job_mp, // &ecore_job_mp,
&ecore_timer_mp, // &ecore_timer_mp,
&ecore_poller_mp, // &ecore_poller_mp,
&ecore_pipe_mp, &ecore_pipe_mp,
&ecore_fd_handler_mp, &ecore_fd_handler_mp,
#ifdef _WIN32 #ifdef _WIN32
@ -75,16 +75,16 @@ ecore_mempool_init(void)
#define MP_SIZE_INIT(TYPE, Type) \ #define MP_SIZE_INIT(TYPE, Type) \
Type##_mp.size = _ecore_sizeof_##TYPE Type##_mp.size = _ecore_sizeof_##TYPE
MP_SIZE_INIT(Ecore_Animator, ecore_animator); // MP_SIZE_INIT(Ecore_Animator, ecore_animator);
MP_SIZE_INIT(Ecore_Event_Handler, ecore_event_handler); MP_SIZE_INIT(Ecore_Event_Handler, ecore_event_handler);
MP_SIZE_INIT(Ecore_Event_Filter, ecore_event_filter); MP_SIZE_INIT(Ecore_Event_Filter, ecore_event_filter);
MP_SIZE_INIT(Ecore_Event, ecore_event); MP_SIZE_INIT(Ecore_Event, ecore_event);
MP_SIZE_INIT(Ecore_Idle_Exiter, ecore_idle_exiter); // MP_SIZE_INIT(Ecore_Idle_Exiter, ecore_idle_exiter);
MP_SIZE_INIT(Ecore_Idle_Enterer, ecore_idle_enterer); // MP_SIZE_INIT(Ecore_Idle_Enterer, ecore_idle_enterer);
MP_SIZE_INIT(Ecore_Idler, ecore_idler); // MP_SIZE_INIT(Ecore_Idler, ecore_idler);
MP_SIZE_INIT(Ecore_Job, ecore_job); // MP_SIZE_INIT(Ecore_Job, ecore_job);
MP_SIZE_INIT(Ecore_Timer, ecore_timer); // MP_SIZE_INIT(Ecore_Timer, ecore_timer);
MP_SIZE_INIT(Ecore_Poller, ecore_poller); // MP_SIZE_INIT(Ecore_Poller, ecore_poller);
MP_SIZE_INIT(Ecore_Pipe, ecore_pipe); MP_SIZE_INIT(Ecore_Pipe, ecore_pipe);
MP_SIZE_INIT(Ecore_Fd_Handler, ecore_fd_handler); MP_SIZE_INIT(Ecore_Fd_Handler, ecore_fd_handler);
#ifdef _WIN32 #ifdef _WIN32

223
legacy/ecore/src/lib/ecore/ecore_anim.c
View File

@ -8,10 +8,22 @@
#include "Ecore.h" #include "Ecore.h"
#include "ecore_private.h" #include "ecore_private.h"
struct _Ecore_Animator #include "Eo.h"
#define MY_CLASS ECORE_ANIMATOR_CLASS
#define MY_CLASS_NAME "ecore_animator"
#define ECORE_ANIMATOR_CHECK(obj) \
if (!eo_isa((obj), ECORE_ANIMATOR_CLASS)) \
return
EAPI Eo_Op ECORE_ANIMATOR_BASE_ID = EO_NOOP;
struct _Ecore_Animator_Private_Data
{ {
EINA_INLIST; EINA_INLIST;
ECORE_MAGIC; Ecore_Animator *obj;
Ecore_Task_Cb func; Ecore_Task_Cb func;
void *data; void *data;
@ -25,13 +37,13 @@ struct _Ecore_Animator
Eina_Bool just_added : 1; Eina_Bool just_added : 1;
}; };
GENERIC_ALLOC_SIZE_DECLARE(Ecore_Animator); typedef struct _Ecore_Animator_Private_Data Ecore_Animator_Private_Data;
static Eina_Bool _ecore_animator_run(void *data); static Eina_Bool _ecore_animator_run(void *data);
static Eina_Bool _ecore_animator(void *data); static Eina_Bool _ecore_animator(void *data);
static int animators_delete_me = 0; static int animators_delete_me = 0;
static Ecore_Animator *animators = NULL; static Ecore_Animator_Private_Data *animators = NULL;
static double animators_frametime = 1.0 / 30.0; static double animators_frametime = 1.0 / 30.0;
static Ecore_Animator_Source src = ECORE_ANIMATOR_SOURCE_TIMER; static Ecore_Animator_Source src = ECORE_ANIMATOR_SOURCE_TIMER;
@ -98,7 +110,7 @@ _end_tick(void)
static Eina_Bool static Eina_Bool
_do_tick(void) _do_tick(void)
{ {
Ecore_Animator *animator; Ecore_Animator_Private_Data *animator;
EINA_INLIST_FOREACH(animators, animator) EINA_INLIST_FOREACH(animators, animator)
{ {
@ -120,18 +132,23 @@ _do_tick(void)
} }
if (animators_delete_me) if (animators_delete_me)
{ {
Ecore_Animator *l; Ecore_Animator_Private_Data *l;
for (l = animators; l; ) for (l = animators; l; )
{ {
animator = l; animator = l;
l = (Ecore_Animator *)EINA_INLIST_GET(l)->next; l = (Ecore_Animator_Private_Data *)EINA_INLIST_GET(l)->next;
if (animator->delete_me) if (animator->delete_me)
{ {
animators = (Ecore_Animator *) animators = (Ecore_Animator_Private_Data *)
eina_inlist_remove(EINA_INLIST_GET(animators), eina_inlist_remove(EINA_INLIST_GET(animators),
EINA_INLIST_GET(animator)); EINA_INLIST_GET(animator));
ECORE_MAGIC_SET(animator, ECORE_MAGIC_NONE);
ecore_animator_mp_free(animator); eo_parent_set(animator->obj, NULL);
if (eo_destructed_is(animator->obj))
eo_manual_free(animator->obj);
else
eo_manual_free_set(animator->obj, EINA_FALSE);
animators_delete_me--; animators_delete_me--;
if (animators_delete_me == 0) break; if (animators_delete_me == 0) break;
} }
@ -145,56 +162,100 @@ _do_tick(void)
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
} }
static Ecore_Animator * static Eina_Bool
_ecore_animator_add(Ecore_Task_Cb func, _ecore_animator_add(Ecore_Animator *obj,
Ecore_Animator_Private_Data *animator,
Ecore_Task_Cb func,
const void *data) const void *data)
{ {
Ecore_Animator *animator = NULL; if (EINA_UNLIKELY(!eina_main_loop_is()))
{
eo_error_set(obj);
EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE);
}
animator->obj = obj;
eo_do_super(obj, eo_constructor());
eo_manual_free_set(obj, EINA_TRUE);
if (!func)
{
eo_error_set(obj);
ERR("callback function must be set up for an object of class: '%s'", MY_CLASS_NAME);
return EINA_FALSE;
}
if (!func) return animator;
animator = ecore_animator_calloc(1);
if (!animator) return animator;
ECORE_MAGIC_SET(animator, ECORE_MAGIC_ANIMATOR);
animator->func = func; animator->func = func;
animator->data = (void *)data; animator->data = (void *)data;
animator->just_added = EINA_TRUE; animator->just_added = EINA_TRUE;
animators = (Ecore_Animator *)eina_inlist_append(EINA_INLIST_GET(animators), EINA_INLIST_GET(animator)); animators = (Ecore_Animator_Private_Data *)eina_inlist_append(EINA_INLIST_GET(animators), EINA_INLIST_GET(animator));
_begin_tick(); _begin_tick();
return animator; return EINA_TRUE;
}
static void
_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
{
eo_error_set(obj);
ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME);
} }
EAPI Ecore_Animator * EAPI Ecore_Animator *
ecore_animator_add(Ecore_Task_Cb func, ecore_animator_add(Ecore_Task_Cb func,
const void *data) const void *data)
{ {
Ecore_Animator *animator; Ecore_Animator *animator = NULL;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
_ecore_lock();
animator = _ecore_animator_add(func, data);
_ecore_unlock();
animator = eo_add_custom(MY_CLASS, _ecore_parent,
ecore_animator_constructor(func, data));
eo_unref(animator);
return animator; return animator;
} }
static void
_animator_constructor(Eo *obj, void *_pd, va_list *list)
{
Ecore_Task_Cb func = va_arg(*list, Ecore_Task_Cb);
const void *data = va_arg(*list, const void *);
_ecore_lock();
Ecore_Animator_Private_Data *animator = _pd;
_ecore_animator_add(obj, animator, func, data);
_ecore_unlock();
}
EAPI Ecore_Animator * EAPI Ecore_Animator *
ecore_animator_timeline_add(double runtime, ecore_animator_timeline_add(double runtime,
Ecore_Timeline_Cb func, Ecore_Timeline_Cb func,
const void *data) const void *data)
{ {
Ecore_Animator *animator; Ecore_Animator *animator;
animator = eo_add_custom(MY_CLASS, _ecore_parent,
ecore_animator_timeline_constructor(runtime, func, data));
eo_unref(animator);
return animator;
}
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); static void
_animator_timeline_constructor(Eo *obj, void *_pd, va_list *list)
{
_ecore_lock(); _ecore_lock();
double runtime = va_arg(*list, double);
if (runtime <= 0.0) runtime = 0.0; if (runtime <= 0.0) runtime = 0.0;
animator = _ecore_animator_add(_ecore_animator_run, NULL); Ecore_Timeline_Cb func = va_arg(*list, Ecore_Timeline_Cb);
animator->data = animator; const void *data = va_arg(*list, const void *);
Ecore_Animator_Private_Data *animator = _pd;
if (!_ecore_animator_add(obj, animator, _ecore_animator_run, NULL)) goto unlock;
animator->data = obj;
animator->run_func = func; animator->run_func = func;
animator->run_data = (void *)data; animator->run_data = (void *)data;
animator->start = ecore_loop_time_get(); animator->start = ecore_loop_time_get();
animator->run = runtime; animator->run = runtime;
unlock:
_ecore_unlock(); _ecore_unlock();
return animator;
} }
static double static double
@ -333,18 +394,14 @@ ecore_animator_pos_map(double pos,
} }
EAPI void * EAPI void *
ecore_animator_del(Ecore_Animator *animator) ecore_animator_del(Ecore_Animator *obj)
{ {
void *data = NULL; void *data = NULL;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
Ecore_Animator_Private_Data *animator = eo_data_get(obj, MY_CLASS);
_ecore_lock(); _ecore_lock();
if (!ECORE_MAGIC_CHECK(animator, ECORE_MAGIC_ANIMATOR))
{
ECORE_MAGIC_FAIL(animator, ECORE_MAGIC_ANIMATOR,
"ecore_animator_del");
goto unlock;
}
if (animator->delete_me) if (animator->delete_me)
{ {
data = animator->data; data = animator->data;
@ -361,6 +418,17 @@ unlock:
return data; return data;
} }
static void
_destructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Ecore_Animator_Private_Data *pd = _pd;
pd->delete_me = EINA_TRUE;
animators_delete_me++;
eo_do_super(obj, eo_destructor());
}
EAPI void EAPI void
ecore_animator_frametime_set(double frametime) ecore_animator_frametime_set(double frametime)
{ {
@ -384,15 +452,19 @@ ecore_animator_frametime_get(void)
EAPI void EAPI void
ecore_animator_freeze(Ecore_Animator *animator) ecore_animator_freeze(Ecore_Animator *animator)
{
ECORE_ANIMATOR_CHECK(animator);
eo_do(animator, eo_event_freeze());
}
static void
_ecore_animator_freeze(Eo *obj EINA_UNUSED, void *_pd,
va_list *list EINA_UNUSED)
{ {
EINA_MAIN_LOOP_CHECK_RETURN; EINA_MAIN_LOOP_CHECK_RETURN;
_ecore_lock(); _ecore_lock();
if (!ECORE_MAGIC_CHECK(animator, ECORE_MAGIC_ANIMATOR)) Ecore_Animator_Private_Data *animator = _pd;
{
ECORE_MAGIC_FAIL(animator, ECORE_MAGIC_ANIMATOR,
"ecore_animator_del");
goto unlock;
}
if (animator->delete_me) goto unlock; if (animator->delete_me) goto unlock;
animator->suspended = EINA_TRUE; animator->suspended = EINA_TRUE;
unlock: unlock:
@ -401,15 +473,19 @@ unlock:
EAPI void EAPI void
ecore_animator_thaw(Ecore_Animator *animator) ecore_animator_thaw(Ecore_Animator *animator)
{
ECORE_ANIMATOR_CHECK(animator);
eo_do(animator, eo_event_thaw());
}
static void
_ecore_animator_thaw(Eo *obj EINA_UNUSED, void *_pd,
va_list *list EINA_UNUSED)
{ {
EINA_MAIN_LOOP_CHECK_RETURN; EINA_MAIN_LOOP_CHECK_RETURN;
Ecore_Animator_Private_Data *animator = _pd;
_ecore_lock(); _ecore_lock();
if (!ECORE_MAGIC_CHECK(animator, ECORE_MAGIC_ANIMATOR))
{
ECORE_MAGIC_FAIL(animator, ECORE_MAGIC_ANIMATOR,
"ecore_animator_del");
goto unlock;
}
if (animator->delete_me) goto unlock; if (animator->delete_me) goto unlock;
animator->suspended = EINA_FALSE; animator->suspended = EINA_FALSE;
unlock: unlock:
@ -475,19 +551,25 @@ _ecore_animator_shutdown(void)
_end_tick(); _end_tick();
while (animators) while (animators)
{ {
Ecore_Animator *animator; Ecore_Animator_Private_Data *animator;
animator = animators; animator = animators;
animators = (Ecore_Animator *)eina_inlist_remove(EINA_INLIST_GET(animators), EINA_INLIST_GET(animators)); animators = (Ecore_Animator_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(animators), EINA_INLIST_GET(animators));
ECORE_MAGIC_SET(animator, ECORE_MAGIC_NONE);
ecore_animator_mp_free(animator); eo_parent_set(animator->obj, NULL);
if (eo_destructed_is(animator->obj))
eo_manual_free(animator->obj);
else
eo_manual_free_set(animator->obj, EINA_FALSE);
} }
} }
static Eina_Bool static Eina_Bool
_ecore_animator_run(void *data) _ecore_animator_run(void *data)
{ {
Ecore_Animator *animator = data; Ecore_Animator *obj = data;
Ecore_Animator_Private_Data *animator = eo_data_get(obj, MY_CLASS);
double pos = 0.0, t; double pos = 0.0, t;
Eina_Bool run_ret; Eina_Bool run_ret;
@ -514,3 +596,38 @@ _ecore_animator(void *data __UNUSED__)
return r; return r;
} }
static void
_class_constructor(Eo_Class *klass)
{
const Eo_Op_Func_Description func_desc[] = {
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor),
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_EVENT_FREEZE), _ecore_animator_freeze),
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_EVENT_THAW), _ecore_animator_thaw),
EO_OP_FUNC(ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR), _animator_constructor),
EO_OP_FUNC(ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR), _animator_timeline_constructor),
EO_OP_FUNC_SENTINEL
};
eo_class_funcs_set(klass, func_desc);
}
static const Eo_Op_Description op_desc[] = {
EO_OP_DESCRIPTION(ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR, "Add an animator to call func at every animation tick during main loop execution."),
EO_OP_DESCRIPTION(ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR, "Add an animator that runs for a limited time"),
EO_OP_DESCRIPTION_SENTINEL
};
static const Eo_Class_Description class_desc = {
EO_VERSION,
MY_CLASS_NAME,
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(&ECORE_ANIMATOR_BASE_ID, op_desc, ECORE_ANIMATOR_SUB_ID_LAST),
NULL,
sizeof(Ecore_Animator_Private_Data),
_class_constructor,
NULL
};
EO_DEFINE_CLASS(ecore_animator_class_get, &class_desc, EO_BASE_CLASS, NULL)

200
legacy/ecore/src/lib/ecore/ecore_idle_enterer.c
View File

@ -7,19 +7,27 @@
#include "Ecore.h" #include "Ecore.h"
#include "ecore_private.h" #include "ecore_private.h"
struct _Ecore_Idle_Enterer #include "Eo.h"
#define MY_CLASS ECORE_IDLE_ENTERER_CLASS
#define MY_CLASS_NAME "ecore_idle_enterer"
EAPI Eo_Op ECORE_IDLE_ENTERER_BASE_ID = EO_NOOP;
struct _Ecore_Idle_Enterer_Private_Data
{ {
EINA_INLIST; EINA_INLIST;
ECORE_MAGIC; Ecore_Idle_Enterer *obj;
Ecore_Task_Cb func; Ecore_Task_Cb func;
void *data; void *data;
int references; int references;
Eina_Bool delete_me : 1; Eina_Bool delete_me : 1;
}; };
GENERIC_ALLOC_SIZE_DECLARE(Ecore_Idle_Enterer); typedef struct _Ecore_Idle_Enterer_Private_Data Ecore_Idle_Enterer_Private_Data;
static Ecore_Idle_Enterer *idle_enterers = NULL; static Ecore_Idle_Enterer_Private_Data *idle_enterers = NULL;
static Ecore_Idle_Enterer *idle_enterer_current = NULL; static Ecore_Idle_Enterer_Private_Data *idle_enterer_current = NULL;
static int idle_enterers_delete_me = 0; static int idle_enterers_delete_me = 0;
static void * static void *
@ -31,6 +39,34 @@ _ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
* @{ * @{
*/ */
static Eina_Bool
_ecore_idle_enterer_add(Ecore_Idle_Enterer *obj,
Ecore_Idle_Enterer_Private_Data *ie,
Ecore_Task_Cb func,
const void *data)
{
if (EINA_UNLIKELY(!eina_main_loop_is()))
{
eo_error_set(obj);
EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FLASE);
}
ie->obj = obj;
eo_do_super(obj, eo_constructor());
eo_manual_free_set(obj, EINA_TRUE);
if (!func)
{
eo_error_set(obj);
ERR("callback function must be set up for an object of class: '%s'", MY_CLASS_NAME);
return EINA_FALSE;
}
ie->func = func;
ie->data = (void *)data;
return EINA_TRUE;
}
/** /**
* Add an idle enterer handler. * Add an idle enterer handler.
* @param func The function to call when entering an idle state. * @param func The function to call when entering an idle state.
@ -46,20 +82,25 @@ ecore_idle_enterer_add(Ecore_Task_Cb func,
const void *data) const void *data)
{ {
Ecore_Idle_Enterer *ie = NULL; Ecore_Idle_Enterer *ie = NULL;
ie = eo_add_custom(MY_CLASS, _ecore_parent, ecore_idle_enterer_after_constructor(func, data));
eo_unref(ie);
return ie;
}
static void
_idle_enterer_after_constructor(Eo *obj, void *_pd, va_list *list)
{
Ecore_Task_Cb func = va_arg(*list, Ecore_Task_Cb);
const void *data = va_arg(*list, const void *);
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
_ecore_lock(); _ecore_lock();
Ecore_Idle_Enterer_Private_Data *ie = _pd;
if (!_ecore_idle_enterer_add(obj, ie, func, data)) goto unlock;
idle_enterers = (Ecore_Idle_Enterer_Private_Data *)eina_inlist_append(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(ie));
if (!func) goto unlock;
ie = ecore_idle_enterer_calloc(1);
if (!ie) goto unlock;
ECORE_MAGIC_SET(ie, ECORE_MAGIC_IDLE_ENTERER);
ie->func = func;
ie->data = (void *)data;
idle_enterers = (Ecore_Idle_Enterer *)eina_inlist_append(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(ie));
unlock: unlock:
_ecore_unlock(); _ecore_unlock();
return ie;
} }
/** /**
@ -77,20 +118,32 @@ ecore_idle_enterer_before_add(Ecore_Task_Cb func,
const void *data) const void *data)
{ {
Ecore_Idle_Enterer *ie = NULL; Ecore_Idle_Enterer *ie = NULL;
ie = eo_add_custom(MY_CLASS, _ecore_parent, ecore_idle_enterer_before_constructor(func, data));
eo_unref(ie);
return ie;
}
static void
_idle_enterer_before_constructor(Eo *obj, void *_pd, va_list *list)
{
Ecore_Task_Cb func = va_arg(*list, Ecore_Task_Cb);
const void *data = va_arg(*list, const void *);
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
_ecore_lock(); _ecore_lock();
Ecore_Idle_Enterer_Private_Data *ie = _pd;
if (!_ecore_idle_enterer_add(obj, ie, func, data)) goto unlock;
idle_enterers = (Ecore_Idle_Enterer_Private_Data *)eina_inlist_prepend(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(ie));
if (!func) goto unlock;
ie = ecore_idle_enterer_calloc(1);
if (!ie) goto unlock;
ECORE_MAGIC_SET(ie, ECORE_MAGIC_IDLE_ENTERER);
ie->func = func;
ie->data = (void *)data;
idle_enterers = (Ecore_Idle_Enterer *)eina_inlist_prepend(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(ie));
unlock: unlock:
_ecore_unlock(); _ecore_unlock();
return ie; }
static void
_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
{
eo_error_set(obj);
ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME);
} }
/** /**
@ -102,15 +155,10 @@ unlock:
EAPI void * EAPI void *
ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer) ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer)
{ {
void *data; void *data = NULL;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
if (!ECORE_MAGIC_CHECK(idle_enterer, ECORE_MAGIC_IDLE_ENTERER))
{
ECORE_MAGIC_FAIL(idle_enterer, ECORE_MAGIC_IDLE_ENTERER,
"ecore_idle_enterer_del");
return NULL;
}
_ecore_lock(); _ecore_lock();
data = _ecore_idle_enterer_del(idle_enterer); data = _ecore_idle_enterer_del(idle_enterer);
_ecore_unlock(); _ecore_unlock();
@ -121,24 +169,42 @@ ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer)
* @} * @}
*/ */
static void * static void *
_ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer) _ecore_idle_enterer_del(Ecore_Idle_Enterer *obj)
{ {
Ecore_Idle_Enterer_Private_Data *idle_enterer = eo_data_get(obj, MY_CLASS);
EINA_SAFETY_ON_TRUE_RETURN_VAL(idle_enterer->delete_me, NULL); EINA_SAFETY_ON_TRUE_RETURN_VAL(idle_enterer->delete_me, NULL);
idle_enterer->delete_me = 1; idle_enterer->delete_me = 1;
idle_enterers_delete_me = 1; idle_enterers_delete_me = 1;
return idle_enterer->data; return idle_enterer->data;
} }
static void
_destructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Ecore_Idle_Enterer_Private_Data *idle_enterer = _pd;
idle_enterer->delete_me = 1;
idle_enterers_delete_me = 1;
eo_do_super(obj, eo_destructor());
}
void void
_ecore_idle_enterer_shutdown(void) _ecore_idle_enterer_shutdown(void)
{ {
Ecore_Idle_Enterer *ie; Ecore_Idle_Enterer_Private_Data *ie;
while ((ie = idle_enterers)) while ((ie = idle_enterers))
{ {
idle_enterers = (Ecore_Idle_Enterer *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(idle_enterers)); idle_enterers = (Ecore_Idle_Enterer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(idle_enterers));
ECORE_MAGIC_SET(ie, ECORE_MAGIC_NONE);
ecore_idle_enterer_mp_free(ie); eo_parent_set(ie->obj, NULL);
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
eo_manual_free_set(ie->obj, EINA_FALSE);
} }
idle_enterers_delete_me = 0; idle_enterers_delete_me = 0;
idle_enterer_current = NULL; idle_enterer_current = NULL;
@ -156,34 +222,34 @@ _ecore_idle_enterer_call(void)
{ {
/* recursive main loop, continue from where we were */ /* recursive main loop, continue from where we were */
idle_enterer_current = idle_enterer_current =
(Ecore_Idle_Enterer *)EINA_INLIST_GET(idle_enterer_current)->next; (Ecore_Idle_Enterer_Private_Data *)EINA_INLIST_GET(idle_enterer_current)->next;
} }
while (idle_enterer_current) while (idle_enterer_current)
{ {
Ecore_Idle_Enterer *ie = (Ecore_Idle_Enterer *)idle_enterer_current; Ecore_Idle_Enterer_Private_Data *ie = (Ecore_Idle_Enterer_Private_Data *)idle_enterer_current;
if (!ie->delete_me) if (!ie->delete_me)
{ {
ie->references++; ie->references++;
if (!_ecore_call_task_cb(ie->func, ie->data)) if (!_ecore_call_task_cb(ie->func, ie->data))
{ {
if (!ie->delete_me) _ecore_idle_enterer_del(ie); if (!ie->delete_me) _ecore_idle_enterer_del(ie->obj);
} }
ie->references--; ie->references--;
} }
if (idle_enterer_current) /* may have changed in recursive main loops */ if (idle_enterer_current) /* may have changed in recursive main loops */
idle_enterer_current = idle_enterer_current =
(Ecore_Idle_Enterer *)EINA_INLIST_GET(idle_enterer_current)->next; (Ecore_Idle_Enterer_Private_Data *)EINA_INLIST_GET(idle_enterer_current)->next;
} }
if (idle_enterers_delete_me) if (idle_enterers_delete_me)
{ {
Ecore_Idle_Enterer *l; Ecore_Idle_Enterer_Private_Data *l;
int deleted_idler_enterers_in_use = 0; int deleted_idler_enterers_in_use = 0;
for (l = idle_enterers; l; ) for (l = idle_enterers; l; )
{ {
Ecore_Idle_Enterer *ie = l; Ecore_Idle_Enterer_Private_Data *ie = l;
l = (Ecore_Idle_Enterer *)EINA_INLIST_GET(l)->next; l = (Ecore_Idle_Enterer_Private_Data *)EINA_INLIST_GET(l)->next;
if (ie->delete_me) if (ie->delete_me)
{ {
if (ie->references) if (ie->references)
@ -192,9 +258,13 @@ _ecore_idle_enterer_call(void)
continue; continue;
} }
idle_enterers = (Ecore_Idle_Enterer *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(ie)); idle_enterers = (Ecore_Idle_Enterer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(ie));
ECORE_MAGIC_SET(ie, ECORE_MAGIC_NONE);
ecore_idle_enterer_mp_free(ie); eo_parent_set(ie->obj, NULL);
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
eo_manual_free_set(ie->obj, EINA_FALSE);
} }
} }
if (!deleted_idler_enterers_in_use) if (!deleted_idler_enterers_in_use)
@ -209,3 +279,35 @@ _ecore_idle_enterer_exist(void)
return 0; return 0;
} }
static void
_class_constructor(Eo_Class *klass)
{
const Eo_Op_Func_Description func_desc[] = {
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor),
EO_OP_FUNC(ECORE_IDLE_ENTERER_ID(ECORE_IDLE_ENTERER_SUB_ID_AFTER_CONSTRUCTOR), _idle_enterer_after_constructor),
EO_OP_FUNC(ECORE_IDLE_ENTERER_ID(ECORE_IDLE_ENTERER_SUB_ID_BEFORE_CONSTRUCTOR), _idle_enterer_before_constructor),
EO_OP_FUNC_SENTINEL
};
eo_class_funcs_set(klass, func_desc);
}
static const Eo_Op_Description op_desc[] = {
EO_OP_DESCRIPTION(ECORE_IDLE_ENTERER_SUB_ID_AFTER_CONSTRUCTOR, "Add an idle enterer handler."),
EO_OP_DESCRIPTION(ECORE_IDLE_ENTERER_SUB_ID_BEFORE_CONSTRUCTOR, "Add an idle enterer handler at the start of the list so it gets called earlier than others."),
EO_OP_DESCRIPTION_SENTINEL
};
static const Eo_Class_Description class_desc = {
EO_VERSION,
MY_CLASS_NAME,
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(&ECORE_IDLE_ENTERER_BASE_ID, op_desc, ECORE_IDLE_ENTERER_SUB_ID_LAST),
NULL,
sizeof(Ecore_Idle_Enterer_Private_Data),
_class_constructor,
NULL
};
EO_DEFINE_CLASS(ecore_idle_enterer_class_get, &class_desc, EO_BASE_CLASS, NULL)

163
legacy/ecore/src/lib/ecore/ecore_idle_exiter.c
View File

@ -7,19 +7,28 @@
#include "Ecore.h" #include "Ecore.h"
#include "ecore_private.h" #include "ecore_private.h"
struct _Ecore_Idle_Exiter #include "Eo.h"
#define MY_CLASS ECORE_IDLE_EXITER_CLASS
#define MY_CLASS_NAME "ecore_idle_exitier"
EAPI Eo_Op ECORE_IDLE_EXITER_BASE_ID = EO_NOOP;
struct _Ecore_Idle_Exiter_Private_Data
{ {
EINA_INLIST; EINA_INLIST;
ECORE_MAGIC; Ecore_Idle_Exiter *obj;
Ecore_Task_Cb func; Ecore_Task_Cb func;
void *data; void *data;
int references; int references;
Eina_Bool delete_me : 1; Eina_Bool delete_me : 1;
}; };
GENERIC_ALLOC_SIZE_DECLARE(Ecore_Idle_Exiter);
static Ecore_Idle_Exiter *idle_exiters = NULL; typedef struct _Ecore_Idle_Exiter_Private_Data Ecore_Idle_Exiter_Private_Data;
static Ecore_Idle_Exiter *idle_exiter_current = NULL;
static Ecore_Idle_Exiter_Private_Data *idle_exiters = NULL;
static Ecore_Idle_Exiter_Private_Data *idle_exiter_current = NULL;
static int idle_exiters_delete_me = 0; static int idle_exiters_delete_me = 0;
static void * static void *
@ -45,19 +54,49 @@ ecore_idle_exiter_add(Ecore_Task_Cb func,
const void *data) const void *data)
{ {
Ecore_Idle_Exiter *ie = NULL; Ecore_Idle_Exiter *ie = NULL;
ie = eo_add_custom(MY_CLASS, _ecore_parent, ecore_idle_exiter_constructor(func, data));
eo_unref(ie);
return ie;
}
static void
_idle_exiter_constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Ecore_Task_Cb func = va_arg(*list, Ecore_Task_Cb);
const void *data = va_arg(*list, const void *);
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
_ecore_lock(); _ecore_lock();
if (!func) goto unlock; if (EINA_UNLIKELY(!eina_main_loop_is()))
ie = ecore_idle_exiter_calloc(1); {
if (!ie) goto unlock; eo_error_set(obj);
ECORE_MAGIC_SET(ie, ECORE_MAGIC_IDLE_EXITER); EINA_MAIN_LOOP_CHECK_RETURN;
}
Ecore_Idle_Exiter_Private_Data *ie = _pd;
ie->obj = obj;
eo_do_super(obj, eo_constructor());
eo_manual_free_set(obj, EINA_TRUE);
if (!func)
{
eo_error_set(obj);
ERR("callback function must be set up for an object of class: '%s'", MY_CLASS_NAME);
return;
}
ie->func = func; ie->func = func;
ie->data = (void *)data; ie->data = (void *)data;
idle_exiters = (Ecore_Idle_Exiter *)eina_inlist_append(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(ie));
unlock: idle_exiters = (Ecore_Idle_Exiter_Private_Data *)eina_inlist_append(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(ie));
_ecore_unlock(); _ecore_unlock();
return ie; }
static void
_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
{
eo_error_set(obj);
ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME);
} }
/** /**
@ -72,12 +111,7 @@ ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter)
void *data; void *data;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
if (!ECORE_MAGIC_CHECK(idle_exiter, ECORE_MAGIC_IDLE_EXITER))
{
ECORE_MAGIC_FAIL(idle_exiter, ECORE_MAGIC_IDLE_EXITER,
"ecore_idle_exiter_del");
return NULL;
}
_ecore_lock(); _ecore_lock();
data = _ecore_idle_exiter_del(idle_exiter); data = _ecore_idle_exiter_del(idle_exiter);
_ecore_unlock(); _ecore_unlock();
@ -87,25 +121,41 @@ ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter)
/** /**
* @} * @}
*/ */
static void * static void *
_ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter) _ecore_idle_exiter_del(Ecore_Idle_Exiter *obj)
{ {
Ecore_Idle_Exiter_Private_Data *idle_exiter = eo_data_get(obj, MY_CLASS);
EINA_SAFETY_ON_TRUE_RETURN_VAL(idle_exiter->delete_me, NULL); EINA_SAFETY_ON_TRUE_RETURN_VAL(idle_exiter->delete_me, NULL);
idle_exiter->delete_me = 1; idle_exiter->delete_me = 1;
idle_exiters_delete_me = 1; idle_exiters_delete_me = 1;
return idle_exiter->data; return idle_exiter->data;
} }
static void
_destructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Ecore_Idle_Exiter_Private_Data *idle_exiter = _pd;
idle_exiter->delete_me = 1;
idle_exiters_delete_me = 1;
eo_do_super(obj, eo_destructor());
}
void void
_ecore_idle_exiter_shutdown(void) _ecore_idle_exiter_shutdown(void)
{ {
Ecore_Idle_Exiter *ie; Ecore_Idle_Exiter_Private_Data *ie;
while ((ie = idle_exiters)) while ((ie = idle_exiters))
{ {
idle_exiters = (Ecore_Idle_Exiter *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(idle_exiters)); idle_exiters = (Ecore_Idle_Exiter_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(idle_exiters));
ECORE_MAGIC_SET(ie, ECORE_MAGIC_NONE);
ecore_idle_exiter_mp_free(ie); eo_parent_set(ie->obj, NULL);
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
eo_manual_free_set(ie->obj, EINA_FALSE);
} }
idle_exiters_delete_me = 0; idle_exiters_delete_me = 0;
idle_exiter_current = NULL; idle_exiter_current = NULL;
@ -123,35 +173,35 @@ _ecore_idle_exiter_call(void)
{ {
/* recursive main loop, continue from where we were */ /* recursive main loop, continue from where we were */
idle_exiter_current = idle_exiter_current =
(Ecore_Idle_Exiter *)EINA_INLIST_GET(idle_exiter_current)->next; (Ecore_Idle_Exiter_Private_Data *)EINA_INLIST_GET(idle_exiter_current)->next;
} }
while (idle_exiter_current) while (idle_exiter_current)
{ {
Ecore_Idle_Exiter *ie = (Ecore_Idle_Exiter *)idle_exiter_current; Ecore_Idle_Exiter_Private_Data *ie = (Ecore_Idle_Exiter_Private_Data *)idle_exiter_current;
if (!ie->delete_me) if (!ie->delete_me)
{ {
ie->references++; ie->references++;
if (!_ecore_call_task_cb(ie->func, ie->data)) if (!_ecore_call_task_cb(ie->func, ie->data))
{ {
if (!ie->delete_me) _ecore_idle_exiter_del(ie); if (!ie->delete_me) _ecore_idle_exiter_del(ie->obj);
} }
ie->references--; ie->references--;
} }
if (idle_exiter_current) /* may have changed in recursive main loops */ if (idle_exiter_current) /* may have changed in recursive main loops */
idle_exiter_current = idle_exiter_current =
(Ecore_Idle_Exiter *)EINA_INLIST_GET(idle_exiter_current)->next; (Ecore_Idle_Exiter_Private_Data *)EINA_INLIST_GET(idle_exiter_current)->next;
} }
if (idle_exiters_delete_me) if (idle_exiters_delete_me)
{ {
Ecore_Idle_Exiter *l; Ecore_Idle_Exiter_Private_Data *l;
int deleted_idler_exiters_in_use = 0; int deleted_idler_exiters_in_use = 0;
for (l = idle_exiters; l; ) for (l = idle_exiters; l; )
{ {
Ecore_Idle_Exiter *ie = l; Ecore_Idle_Exiter_Private_Data *ie = l;
l = (Ecore_Idle_Exiter *)EINA_INLIST_GET(l)->next; l = (Ecore_Idle_Exiter_Private_Data *)EINA_INLIST_GET(l)->next;
if (ie->delete_me) if (ie->delete_me)
{ {
if (ie->references) if (ie->references)
@ -160,9 +210,13 @@ _ecore_idle_exiter_call(void)
continue; continue;
} }
idle_exiters = (Ecore_Idle_Exiter *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(ie)); idle_exiters = (Ecore_Idle_Exiter_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(ie));
ECORE_MAGIC_SET(ie, ECORE_MAGIC_NONE);
ecore_idle_exiter_mp_free(ie); eo_parent_set(ie->obj, NULL);
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
eo_manual_free_set(ie->obj, EINA_FALSE);
} }
} }
if (!deleted_idler_exiters_in_use) if (!deleted_idler_exiters_in_use)
@ -177,3 +231,34 @@ _ecore_idle_exiter_exist(void)
return 0; return 0;
} }
static void
_class_constructor(Eo_Class *klass)
{
const Eo_Op_Func_Description func_desc[] = {
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor),
EO_OP_FUNC(ECORE_IDLE_EXITER_ID(ECORE_IDLE_EXITER_SUB_ID_CONSTRUCTOR), _idle_exiter_constructor),
EO_OP_FUNC_SENTINEL
};
eo_class_funcs_set(klass, func_desc);
}
static const Eo_Op_Description op_desc[] = {
EO_OP_DESCRIPTION(ECORE_IDLE_EXITER_SUB_ID_CONSTRUCTOR, "Add an idle exiter handler."),
EO_OP_DESCRIPTION_SENTINEL
};
static const Eo_Class_Description class_desc = {
EO_VERSION,
MY_CLASS_NAME,
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(&ECORE_IDLE_EXITER_BASE_ID, op_desc, ECORE_IDLE_EXITER_SUB_ID_LAST),
NULL,
sizeof(Ecore_Idle_Exiter_Private_Data),
_class_constructor,
NULL
};
EO_DEFINE_CLASS(ecore_idle_exiter_class_get, &class_desc, EO_BASE_CLASS, NULL)

156
legacy/ecore/src/lib/ecore/ecore_idler.c
View File

@ -7,19 +7,27 @@
#include "Ecore.h" #include "Ecore.h"
#include "ecore_private.h" #include "ecore_private.h"
struct _Ecore_Idler #include "Eo.h"
#define MY_CLASS ECORE_IDLER_CLASS
#define MY_CLASS_NAME "ecore_idler"
EAPI Eo_Op ECORE_IDLER_BASE_ID = EO_NOOP;
struct _Ecore_Idler_Private_Data
{ {
EINA_INLIST; EINA_INLIST;
ECORE_MAGIC; Ecore_Idler *obj;
Ecore_Task_Cb func; Ecore_Task_Cb func;
void *data; void *data;
int references; int references;
Eina_Bool delete_me : 1; Eina_Bool delete_me : 1;
}; };
GENERIC_ALLOC_SIZE_DECLARE(Ecore_Idler);
static Ecore_Idler *idlers = NULL; typedef struct _Ecore_Idler_Private_Data Ecore_Idler_Private_Data;
static Ecore_Idler *idler_current = NULL; static Ecore_Idler_Private_Data *idlers = NULL;
static Ecore_Idler_Private_Data *idler_current = NULL;
static int idlers_delete_me = 0; static int idlers_delete_me = 0;
static void * static void *
@ -31,32 +39,59 @@ ecore_idler_add(Ecore_Task_Cb func,
{ {
Ecore_Idler *ie = NULL; Ecore_Idler *ie = NULL;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
_ecore_lock(); _ecore_lock();
if (!func) goto unlock;
ie = ecore_idler_calloc(1); ie = eo_add_custom(MY_CLASS, _ecore_parent, ecore_idler_constructor(func, data));
if (!ie) goto unlock; eo_unref(ie);
ECORE_MAGIC_SET(ie, ECORE_MAGIC_IDLER);
ie->func = func;
ie->data = (void *)data;
idlers = (Ecore_Idler *)eina_inlist_append(EINA_INLIST_GET(idlers), EINA_INLIST_GET(ie));
unlock:
_ecore_unlock(); _ecore_unlock();
return ie; return ie;
} }
static void
_idler_constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Ecore_Task_Cb func = va_arg(*list, Ecore_Task_Cb);
const void *data = va_arg(*list, const void *);
if (EINA_UNLIKELY(!eina_main_loop_is()))
{
eo_error_set(obj);
EINA_MAIN_LOOP_CHECK_RETURN;
}
Ecore_Idler_Private_Data *ie = _pd;
ie->obj = obj;
eo_do_super(obj, eo_constructor());
eo_manual_free_set(obj, EINA_TRUE);
if (!func)
{
eo_error_set(obj);
ERR("callback function must be set up for an object of class: '%s'", MY_CLASS_NAME);
return;
}
ie->func = func;
ie->data = (void *)data;
idlers = (Ecore_Idler_Private_Data *)eina_inlist_append(EINA_INLIST_GET(idlers), EINA_INLIST_GET(ie));
}
static void
_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
{
eo_error_set(obj);
ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME);
}
EAPI void * EAPI void *
ecore_idler_del(Ecore_Idler *idler) ecore_idler_del(Ecore_Idler *idler)
{ {
void *data = NULL; void *data = NULL;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
if (!ECORE_MAGIC_CHECK(idler, ECORE_MAGIC_IDLER))
{
ECORE_MAGIC_FAIL(idler, ECORE_MAGIC_IDLER,
"ecore_idler_del");
return NULL;
}
_ecore_lock(); _ecore_lock();
data = _ecore_idler_del(idler); data = _ecore_idler_del(idler);
@ -73,23 +108,39 @@ ecore_idler_del(Ecore_Idler *idler)
*/ */
static void * static void *
_ecore_idler_del(Ecore_Idler *idler) _ecore_idler_del(Ecore_Idler *obj)
{ {
Ecore_Idler_Private_Data *idler = eo_data_get(obj, MY_CLASS);
EINA_SAFETY_ON_TRUE_RETURN_VAL(idler->delete_me, NULL); EINA_SAFETY_ON_TRUE_RETURN_VAL(idler->delete_me, NULL);
idler->delete_me = 1; idler->delete_me = 1;
idlers_delete_me = 1; idlers_delete_me = 1;
return idler->data; return idler->data;
} }
static void
_destructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Ecore_Idler_Private_Data *idler = _pd;
idler->delete_me = 1;
idlers_delete_me = 1;
eo_do_super(obj, eo_destructor());
}
void void
_ecore_idler_shutdown(void) _ecore_idler_shutdown(void)
{ {
Ecore_Idler *ie; Ecore_Idler_Private_Data *ie;
while ((ie = idlers)) while ((ie = idlers))
{ {
idlers = (Ecore_Idler *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(idlers)); idlers = (Ecore_Idler_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(idlers));
ECORE_MAGIC_SET(ie, ECORE_MAGIC_NONE);
ecore_idler_mp_free(ie); eo_parent_set(ie->obj, NULL);
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
eo_manual_free_set(ie->obj, EINA_FALSE);
} }
idlers_delete_me = 0; idlers_delete_me = 0;
idler_current = NULL; idler_current = NULL;
@ -106,32 +157,32 @@ _ecore_idler_all_call(void)
else else
{ {
/* recursive main loop, continue from where we were */ /* recursive main loop, continue from where we were */
idler_current = (Ecore_Idler *)EINA_INLIST_GET(idler_current)->next; idler_current = (Ecore_Idler_Private_Data *)EINA_INLIST_GET(idler_current)->next;
} }
while (idler_current) while (idler_current)
{ {
Ecore_Idler *ie = (Ecore_Idler *)idler_current; Ecore_Idler_Private_Data *ie = (Ecore_Idler_Private_Data *)idler_current;
if (!ie->delete_me) if (!ie->delete_me)
{ {
ie->references++; ie->references++;
if (!_ecore_call_task_cb(ie->func, ie->data)) if (!_ecore_call_task_cb(ie->func, ie->data))
{ {
if (!ie->delete_me) _ecore_idler_del(ie); if (!ie->delete_me) _ecore_idler_del(ie->obj);
} }
ie->references--; ie->references--;
} }
if (idler_current) /* may have changed in recursive main loops */ if (idler_current) /* may have changed in recursive main loops */
idler_current = (Ecore_Idler *)EINA_INLIST_GET(idler_current)->next; idler_current = (Ecore_Idler_Private_Data *)EINA_INLIST_GET(idler_current)->next;
} }
if (idlers_delete_me) if (idlers_delete_me)
{ {
Ecore_Idler *l; Ecore_Idler_Private_Data *l;
int deleted_idlers_in_use = 0; int deleted_idlers_in_use = 0;
for (l = idlers; l; ) for (l = idlers; l; )
{ {
Ecore_Idler *ie = l; Ecore_Idler_Private_Data *ie = l;
l = (Ecore_Idler *)EINA_INLIST_GET(l)->next; l = (Ecore_Idler_Private_Data *)EINA_INLIST_GET(l)->next;
if (ie->delete_me) if (ie->delete_me)
{ {
if (ie->references) if (ie->references)
@ -140,9 +191,13 @@ _ecore_idler_all_call(void)
continue; continue;
} }
idlers = (Ecore_Idler *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(ie)); idlers = (Ecore_Idler_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(ie));
ECORE_MAGIC_SET(ie, ECORE_MAGIC_NONE);
ecore_idler_mp_free(ie); eo_parent_set(ie->obj, NULL);
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
eo_manual_free_set(ie->obj, EINA_FALSE);
} }
} }
if (!deleted_idlers_in_use) if (!deleted_idlers_in_use)
@ -159,3 +214,34 @@ _ecore_idler_exist(void)
return 0; return 0;
} }
static void
_class_constructor(Eo_Class *klass)
{
const Eo_Op_Func_Description func_desc[] = {
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor),
EO_OP_FUNC(ECORE_IDLER_ID(ECORE_IDLER_SUB_ID_CONSTRUCTOR), _idler_constructor),
EO_OP_FUNC_SENTINEL
};
eo_class_funcs_set(klass, func_desc);
}
static const Eo_Op_Description op_desc[] = {
EO_OP_DESCRIPTION(ECORE_IDLER_SUB_ID_CONSTRUCTOR, "Add an idler handler."),
EO_OP_DESCRIPTION_SENTINEL
};
static const Eo_Class_Description class_desc = {
EO_VERSION,
MY_CLASS_NAME,
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(&ECORE_IDLER_BASE_ID, op_desc, ECORE_IDLER_SUB_ID_LAST),
NULL,
sizeof(Ecore_Idler_Private_Data),
_class_constructor,
NULL
};
EO_DEFINE_CLASS(ecore_idler_class_get, &class_desc, EO_BASE_CLASS, NULL)

123
legacy/ecore/src/lib/ecore/ecore_job.c
View File

@ -2,11 +2,19 @@
# include <config.h> # include <config.h>
#endif #endif
#include <Eo.h>
#include <stdlib.h> #include <stdlib.h>
#include "Ecore.h" #include "Ecore.h"
#include "ecore_private.h" #include "ecore_private.h"
#define MY_CLASS ECORE_JOB_CLASS
#define MY_CLASS_NAME "ecore_job"
EAPI Eo_Op ECORE_JOB_BASE_ID = EO_NOOP;
static Eina_Bool _ecore_job_event_handler(void *data, static Eina_Bool _ecore_job_event_handler(void *data,
int type, int type,
void *ev); void *ev);
@ -16,14 +24,14 @@ static void _ecore_job_event_free(void *data,
static int ecore_event_job_type = 0; static int ecore_event_job_type = 0;
static Ecore_Event_Handler *_ecore_job_handler = NULL; static Ecore_Event_Handler *_ecore_job_handler = NULL;
struct _Ecore_Job typedef struct _Ecore_Job_Private_Data Ecore_Job_Private_Data;
struct _Ecore_Job_Private_Data
{ {
ECORE_MAGIC;
Ecore_Event *event; Ecore_Event *event;
Ecore_Cb func; Ecore_Cb func;
void *data; void *data;
}; };
GENERIC_ALLOC_SIZE_DECLARE(Ecore_Job);
void void
_ecore_job_init(void) _ecore_job_init(void)
@ -58,23 +66,50 @@ EAPI Ecore_Job *
ecore_job_add(Ecore_Cb func, ecore_job_add(Ecore_Cb func,
const void *data) const void *data)
{ {
Ecore_Job *job; Ecore_Job *job = eo_add_custom(MY_CLASS, _ecore_parent, ecore_job_constructor(func, data));
eo_unref(job);
return job;
}
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); static void
if (!func) return NULL; _job_constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Ecore_Cb func = va_arg(*list, Ecore_Cb);
const void *data = va_arg(*list, const void *);
job = ecore_job_calloc(1); if (EINA_UNLIKELY(!eina_main_loop_is()))
if (!job) return NULL; {
ECORE_MAGIC_SET(job, ECORE_MAGIC_JOB); eo_error_set(obj);
job->event = ecore_event_add(ecore_event_job_type, job, _ecore_job_event_free, NULL); EINA_MAIN_LOOP_CHECK_RETURN;
}
eo_do_super(obj, eo_constructor());
eo_manual_free_set(obj, EINA_TRUE);
if (!func)
{
eo_error_set(obj);
ERR("callback function must be set up for an object of class: '%s'", MY_CLASS_NAME);
return;
}
Ecore_Job_Private_Data *job = _pd;
job->event = ecore_event_add(ecore_event_job_type, job, _ecore_job_event_free, obj);
if (!job->event) if (!job->event)
{ {
ecore_job_mp_free(job); eo_error_set(obj);
return NULL; ERR("no event was assigned to object '%p' of class '%s'", obj, MY_CLASS_NAME);
return;
} }
job->func = func; job->func = func;
job->data = (void *)data; job->data = (void *)data;
return job; }
static void
_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
{
eo_error_set(obj);
ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME);
} }
/** /**
@ -83,23 +118,25 @@ ecore_job_add(Ecore_Cb func,
* @return The data pointer that was to be passed to the job. * @return The data pointer that was to be passed to the job.
*/ */
EAPI void * EAPI void *
ecore_job_del(Ecore_Job *job) ecore_job_del(Ecore_Job *obj)
{ {
void *data; void *data;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
if (!ECORE_MAGIC_CHECK(job, ECORE_MAGIC_JOB)) Ecore_Job_Private_Data *job = eo_data_get(obj, MY_CLASS);
{
ECORE_MAGIC_FAIL(job, ECORE_MAGIC_JOB,
"ecore_job_del");
return NULL;
}
data = job->data; data = job->data;
ECORE_MAGIC_SET(job, ECORE_MAGIC_NONE);
ecore_event_del(job->event); ecore_event_del(job->event);
eo_parent_set(obj, NULL);
return data; return data;
} }
static void
_destructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
{
/*FIXME: check if ecore_event_del should be called from here*/
eo_do_super(obj, eo_destructor());
}
/** /**
* @} * @}
*/ */
@ -109,7 +146,7 @@ _ecore_job_event_handler(void *data __UNUSED__,
int type __UNUSED__, int type __UNUSED__,
void *ev) void *ev)
{ {
Ecore_Job *job; Ecore_Job_Private_Data *job;
job = ev; job = ev;
job->func(job->data); job->func(job->data);
@ -117,9 +154,45 @@ _ecore_job_event_handler(void *data __UNUSED__,
} }
static void static void
_ecore_job_event_free(void *data __UNUSED__, _ecore_job_event_free(void *data,
void *job) void *job __UNUSED__)
{ {
ecore_job_mp_free(job); eo_parent_set(data, NULL);
Ecore_Job *obj = data;
if (eo_destructed_is(obj))
eo_manual_free(obj);
else
eo_manual_free_set(obj, EINA_FALSE);
} }
static void
_class_constructor(Eo_Class *klass)
{
const Eo_Op_Func_Description func_desc[] = {
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor),
EO_OP_FUNC(ECORE_JOB_ID(ECORE_JOB_SUB_ID_CONSTRUCTOR), _job_constructor),
EO_OP_FUNC_SENTINEL
};
eo_class_funcs_set(klass, func_desc);
}
static const Eo_Op_Description op_desc[] = {
EO_OP_DESCRIPTION(ECORE_JOB_SUB_ID_CONSTRUCTOR, "Add a job to the event queue."),
EO_OP_DESCRIPTION_SENTINEL
};
static const Eo_Class_Description class_desc = {
EO_VERSION,
MY_CLASS_NAME,
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(&ECORE_JOB_BASE_ID, op_desc, ECORE_JOB_SUB_ID_LAST),
NULL,
sizeof(Ecore_Job_Private_Data),
_class_constructor,
NULL
};
EO_DEFINE_CLASS(ecore_job_class_get, &class_desc, EO_BASE_CLASS, NULL);

226
legacy/ecore/src/lib/ecore/ecore_poll.c
View File

@ -7,16 +7,30 @@
#include "Ecore.h" #include "Ecore.h"
#include "ecore_private.h" #include "ecore_private.h"
struct _Ecore_Poller #include "Eo.h"
#define MY_CLASS ECORE_POLLER_CLASS
#define MY_CLASS_NAME "ecore_poller"
EAPI Eo_Op ECORE_POLLER_BASE_ID = EO_NOOP;
#define ECORE_POLLER_CHECK(obj) \
if (!eo_isa((obj), ECORE_POLLER_CLASS)) \
return
struct _Ecore_Poller_Private_Data
{ {
EINA_INLIST; EINA_INLIST;
ECORE_MAGIC; ECORE_MAGIC;
Ecore_Poller *obj;
int ibit; int ibit;
unsigned char delete_me : 1; unsigned char delete_me : 1;
Ecore_Task_Cb func; Ecore_Task_Cb func;
void *data; void *data;
}; };
GENERIC_ALLOC_SIZE_DECLARE(Ecore_Poller);
typedef struct _Ecore_Poller_Private_Data Ecore_Poller_Private_Data;
static Ecore_Timer *timer = NULL; static Ecore_Timer *timer = NULL;
static int min_interval = -1; static int min_interval = -1;
@ -28,7 +42,7 @@ static int poller_walking = 0;
static double poll_interval = 0.125; static double poll_interval = 0.125;
static double poll_cur_interval = 0.0; static double poll_cur_interval = 0.0;
static double last_tick = 0.0; static double last_tick = 0.0;
static Ecore_Poller *pollers[16] = static Ecore_Poller_Private_Data *pollers[16] =
{ {
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
@ -105,7 +119,7 @@ static Eina_Bool
_ecore_poller_cb_timer(void *data __UNUSED__) _ecore_poller_cb_timer(void *data __UNUSED__)
{ {
int i; int i;
Ecore_Poller *poller, *l; Ecore_Poller_Private_Data *poller, *l;
int changes = 0; int changes = 0;
at_tick++; at_tick++;
@ -156,11 +170,17 @@ _ecore_poller_cb_timer(void *data __UNUSED__)
for (l = pollers[i]; l; ) for (l = pollers[i]; l; )
{ {
poller = l; poller = l;
l = (Ecore_Poller *)EINA_INLIST_GET(l)->next; l = (Ecore_Poller_Private_Data *)EINA_INLIST_GET(l)->next;
if (poller->delete_me) if (poller->delete_me)
{ {
pollers[i] = (Ecore_Poller *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(poller)); pollers[i] = (Ecore_Poller_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(poller));
ecore_poller_mp_free(poller);
eo_parent_set(poller->obj, NULL);
if (eo_destructed_is(poller->obj))
eo_manual_free(poller->obj);
else
eo_manual_free_set(poller->obj, EINA_FALSE);
poller_delete_count--; poller_delete_count--;
changes++; changes++;
if (poller_delete_count <= 0) break; if (poller_delete_count <= 0) break;
@ -212,6 +232,13 @@ ecore_poller_poll_interval_get(Ecore_Poller_Type type __UNUSED__)
return poll_interval; return poll_interval;
} }
static void
_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
{
eo_error_set(obj);
ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME);
}
EAPI Ecore_Poller * EAPI Ecore_Poller *
ecore_poller_add(Ecore_Poller_Type type __UNUSED__, ecore_poller_add(Ecore_Poller_Type type __UNUSED__,
int interval, int interval,
@ -219,15 +246,43 @@ ecore_poller_add(Ecore_Poller_Type type __UNUSED__,
const void *data) const void *data)
{ {
Ecore_Poller *poller; Ecore_Poller *poller;
poller = eo_add_custom(MY_CLASS, _ecore_parent,
ecore_poller_constructor(type, interval, func, data));
eo_unref(poller);
return poller;
}
static void
_poller_constructor(Eo *obj, void *_pd, va_list *list)
{
Ecore_Poller_Type type = va_arg(*list, Ecore_Poller_Type);
(void)type;
int interval = va_arg(*list, int);
Ecore_Task_Cb func = va_arg(*list, Ecore_Task_Cb);
const void *data = va_arg(*list, const void *);
Ecore_Poller_Private_Data *poller = _pd;
poller->obj = obj;
int ibit; int ibit;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); if (EINA_UNLIKELY(!eina_main_loop_is()))
if (!func) return NULL; {
if (interval < 1) interval = 1; eo_error_set(obj);
EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FLASE);
}
eo_do_super(obj, eo_constructor());
eo_manual_free_set(obj, EINA_TRUE);
if (!func)
{
eo_error_set(obj);
ERR("callback function must be set up for an object of class: '%s'", MY_CLASS_NAME);
return;
}
poller = ecore_poller_calloc(1);
if (!poller) return NULL;
ECORE_MAGIC_SET(poller, ECORE_MAGIC_POLLER);
/* interval MUST be a power of 2, so enforce it */ /* interval MUST be a power of 2, so enforce it */
if (interval < 1) interval = 1; if (interval < 1) interval = 1;
ibit = -1; ibit = -1;
@ -242,27 +297,35 @@ ecore_poller_add(Ecore_Poller_Type type __UNUSED__,
poller->ibit = ibit; poller->ibit = ibit;
poller->func = func; poller->func = func;
poller->data = (void *)data; poller->data = (void *)data;
pollers[poller->ibit] = (Ecore_Poller *)eina_inlist_prepend(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller)); pollers[poller->ibit] = (Ecore_Poller_Private_Data *)eina_inlist_prepend(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller));
if (poller_walking) if (poller_walking)
just_added_poller++; just_added_poller++;
else else
_ecore_poller_next_tick_eval(); _ecore_poller_next_tick_eval();
return poller;
} }
EAPI Eina_Bool EAPI Eina_Bool
ecore_poller_poller_interval_set(Ecore_Poller *poller, ecore_poller_poller_interval_set(Ecore_Poller *obj,
int interval) int interval)
{ {
Eina_Bool ret;
ECORE_POLLER_CHECK(obj) EINA_FALSE;
eo_do(obj, ecore_poller_interval_set(interval, &ret));
return ret;
}
static void
_poller_interval_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
{
int interval = va_arg(*list, int);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
Eina_Bool int_ret;
EINA_MAIN_LOOP_CHECK_RETURN;
int ibit; int ibit;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE); Ecore_Poller_Private_Data *poller = _pd;
if (!ECORE_MAGIC_CHECK(poller, ECORE_MAGIC_POLLER))
{
ECORE_MAGIC_FAIL(poller, ECORE_MAGIC_POLLER,
"ecore_poller_poller_interval_set");
return EINA_FALSE;
}
/* interval MUST be a power of 2, so enforce it */ /* interval MUST be a power of 2, so enforce it */
if (interval < 1) interval = 1; if (interval < 1) interval = 1;
@ -276,29 +339,44 @@ ecore_poller_poller_interval_set(Ecore_Poller *poller,
if (ibit > 15) ibit = 15; if (ibit > 15) ibit = 15;
/* if interval specified is the same as interval set, return true without wasting time */ /* if interval specified is the same as interval set, return true without wasting time */
if (poller->ibit == ibit) if (poller->ibit == ibit)
return EINA_TRUE; {
pollers[poller->ibit] = (Ecore_Poller *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller)); int_ret = EINA_TRUE;
goto end;
}
pollers[poller->ibit] = (Ecore_Poller_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller));
poller->ibit = ibit; poller->ibit = ibit;
pollers[poller->ibit] = (Ecore_Poller *)eina_inlist_prepend(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller)); pollers[poller->ibit] = (Ecore_Poller_Private_Data *)eina_inlist_prepend(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller));
if (poller_walking) if (poller_walking)
just_added_poller++; just_added_poller++;
else else
_ecore_poller_next_tick_eval(); _ecore_poller_next_tick_eval();
return EINA_TRUE;
int_ret = EINA_TRUE;
end:
if (ret) *ret = int_ret;
} }
EAPI int EAPI int
ecore_poller_poller_interval_get(Ecore_Poller *poller) ecore_poller_poller_interval_get(Ecore_Poller *obj)
{ {
int ret;
ECORE_POLLER_CHECK(obj) EINA_FALSE;
eo_do(obj, ecore_poller_interval_get(&ret));
return ret;
}
static void
_poller_interval_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
{
int *ret = va_arg(*list, int *);
*ret =0;
int ibit, interval = 1; int ibit, interval = 1;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(0); EINA_MAIN_LOOP_CHECK_RETURN;
if (!ECORE_MAGIC_CHECK(poller, ECORE_MAGIC_POLLER)) Ecore_Poller_Private_Data *poller = _pd;
{
ECORE_MAGIC_FAIL(poller, ECORE_MAGIC_POLLER,
"ecore_poller_poller_interval_get");
return 0;
}
ibit = poller->ibit; ibit = poller->ibit;
while (ibit != 0) while (ibit != 0)
@ -306,21 +384,16 @@ ecore_poller_poller_interval_get(Ecore_Poller *poller)
ibit--; ibit--;
interval <<= 1; interval <<= 1;
} }
return interval; *ret = interval;
} }
EAPI void * EAPI void *
ecore_poller_del(Ecore_Poller *poller) ecore_poller_del(Ecore_Poller *obj)
{ {
void *data; void *data;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
if (!ECORE_MAGIC_CHECK(poller, ECORE_MAGIC_POLLER)) Ecore_Poller_Private_Data *poller = eo_data_get(obj, MY_CLASS);
{
ECORE_MAGIC_FAIL(poller, ECORE_MAGIC_POLLER,
"ecore_poller_del");
return NULL;
}
/* we are walking the poller list - a bad idea to remove from it while /* we are walking the poller list - a bad idea to remove from it while
* walking it, so just flag it as delete_me and come back to it after * walking it, so just flag it as delete_me and come back to it after
* the loop has finished */ * the loop has finished */
@ -332,12 +405,32 @@ ecore_poller_del(Ecore_Poller *poller)
} }
/* not in loop so safe - delete immediately */ /* not in loop so safe - delete immediately */
data = poller->data; data = poller->data;
pollers[poller->ibit] = (Ecore_Poller *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller)); pollers[poller->ibit] = (Ecore_Poller_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller));
ecore_poller_mp_free(poller);
eo_parent_set(poller->obj, NULL);
if (eo_destructed_is(poller->obj))
eo_manual_free(obj);
else
eo_manual_free_set(obj, EINA_FALSE);
_ecore_poller_next_tick_eval(); _ecore_poller_next_tick_eval();
return data; return data;
} }
static void
_destructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Ecore_Poller_Private_Data *pd = _pd;
if (!pd->delete_me)
{
pd->delete_me = 1;
poller_delete_count++;
}
eo_do_super(obj, eo_destructor());
}
/** /**
* @} * @}
*/ */
@ -346,15 +439,52 @@ void
_ecore_poller_shutdown(void) _ecore_poller_shutdown(void)
{ {
int i; int i;
Ecore_Poller *poller; Ecore_Poller_Private_Data *poller;
for (i = 0; i < 15; i++) for (i = 0; i < 15; i++)
{ {
while ((poller = pollers[i])) while ((poller = pollers[i]))
{ {
pollers[i] = (Ecore_Poller *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(pollers[i])); pollers[i] = (Ecore_Poller_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(pollers[i]));
ecore_poller_mp_free(poller); eo_parent_set(poller->obj, NULL);
if (eo_destructed_is(poller->obj))
eo_manual_free(poller->obj);
else
eo_manual_free_set(poller->obj, EINA_FALSE);
} }
} }
} }
static void
_class_constructor(Eo_Class *klass)
{
const Eo_Op_Func_Description func_desc[] = {
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor),
EO_OP_FUNC(ECORE_POLLER_ID(ECORE_POLLER_SUB_ID_CONSTRUCTOR), _poller_constructor),
EO_OP_FUNC(ECORE_POLLER_ID(ECORE_POLLER_SUB_ID_INTERVAL_SET), _poller_interval_set),
EO_OP_FUNC(ECORE_POLLER_ID(ECORE_POLLER_SUB_ID_INTERVAL_GET), _poller_interval_get),
EO_OP_FUNC_SENTINEL
};
eo_class_funcs_set(klass, func_desc);
}
static const Eo_Op_Description op_desc[] = {
EO_OP_DESCRIPTION(ECORE_POLLER_SUB_ID_CONSTRUCTOR, "Add an idle enterer handler."),
EO_OP_DESCRIPTION(ECORE_POLLER_SUB_ID_INTERVAL_SET, "Changes the polling interval rate of poller."),
EO_OP_DESCRIPTION(ECORE_POLLER_SUB_ID_INTERVAL_GET, "Gets the polling interval rate of poller"),
EO_OP_DESCRIPTION_SENTINEL
};
static const Eo_Class_Description class_desc = {
EO_VERSION,
MY_CLASS_NAME,
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(&ECORE_POLLER_BASE_ID, op_desc, ECORE_POLLER_SUB_ID_LAST),
NULL,
sizeof(Ecore_Poller_Private_Data),
_class_constructor,
NULL
};
EO_DEFINE_CLASS(ecore_poller_class_get, &class_desc, EO_BASE_CLASS, NULL)

18
legacy/ecore/src/lib/ecore/ecore_private.h
View File

@ -359,16 +359,16 @@ void ecore_mempool_shutdown(void);
#define GENERIC_ALLOC_SIZE_DECLARE(TYPE) \ #define GENERIC_ALLOC_SIZE_DECLARE(TYPE) \
size_t _ecore_sizeof_##TYPE = sizeof (TYPE); size_t _ecore_sizeof_##TYPE = sizeof (TYPE);
GENERIC_ALLOC_FREE_HEADER(Ecore_Animator, ecore_animator); //GENERIC_ALLOC_FREE_HEADER(Ecore_Animator, ecore_animator);
GENERIC_ALLOC_FREE_HEADER(Ecore_Event_Handler, ecore_event_handler); GENERIC_ALLOC_FREE_HEADER(Ecore_Event_Handler, ecore_event_handler);
GENERIC_ALLOC_FREE_HEADER(Ecore_Event_Filter, ecore_event_filter); GENERIC_ALLOC_FREE_HEADER(Ecore_Event_Filter, ecore_event_filter);
GENERIC_ALLOC_FREE_HEADER(Ecore_Event, ecore_event); GENERIC_ALLOC_FREE_HEADER(Ecore_Event, ecore_event);
GENERIC_ALLOC_FREE_HEADER(Ecore_Idle_Exiter, ecore_idle_exiter); //GENERIC_ALLOC_FREE_HEADER(Ecore_Idle_Exiter, ecore_idle_exiter);
GENERIC_ALLOC_FREE_HEADER(Ecore_Idle_Enterer, ecore_idle_enterer); //GENERIC_ALLOC_FREE_HEADER(Ecore_Idle_Enterer, ecore_idle_enterer);
GENERIC_ALLOC_FREE_HEADER(Ecore_Idler, ecore_idler); //GENERIC_ALLOC_FREE_HEADER(Ecore_Idler, ecore_idler);
GENERIC_ALLOC_FREE_HEADER(Ecore_Job, ecore_job); //GENERIC_ALLOC_FREE_HEADER(Ecore_Job, ecore_job);
GENERIC_ALLOC_FREE_HEADER(Ecore_Timer, ecore_timer); //GENERIC_ALLOC_FREE_HEADER(Ecore_Timer, ecore_timer);
GENERIC_ALLOC_FREE_HEADER(Ecore_Poller, ecore_poller); //GENERIC_ALLOC_FREE_HEADER(Ecore_Poller, ecore_poller);
GENERIC_ALLOC_FREE_HEADER(Ecore_Pipe, ecore_pipe); GENERIC_ALLOC_FREE_HEADER(Ecore_Pipe, ecore_pipe);
GENERIC_ALLOC_FREE_HEADER(Ecore_Fd_Handler, ecore_fd_handler); GENERIC_ALLOC_FREE_HEADER(Ecore_Fd_Handler, ecore_fd_handler);
#ifdef _WIN32 #ifdef _WIN32
@ -377,4 +377,8 @@ GENERIC_ALLOC_FREE_HEADER(Ecore_Win32_Handler, ecore_win32_handler);
#undef GENERIC_ALLOC_FREE_HEADER #undef GENERIC_ALLOC_FREE_HEADER
EAPI extern Eo *_ecore_parent;
#define ECORE_PARENT_CLASS ecore_parent_class_get()
const Eo_Class *ecore_parent_class_get(void) EINA_CONST;
#endif #endif

505
legacy/ecore/src/lib/ecore/ecore_timer.c
View File

@ -8,6 +8,17 @@
#include "Ecore.h" #include "Ecore.h"
#include "ecore_private.h" #include "ecore_private.h"
#include "Eo.h"
#define MY_CLASS ECORE_TIMER_CLASS
#define MY_CLASS_NAME "ecore_timer"
EAPI Eo_Op ECORE_TIMER_BASE_ID = EO_NOOP;
#define ECORE_TIMER_CHECK(obj) \
if (!eo_isa((obj), ECORE_TIMER_CLASS)) \
return
#ifdef WANT_ECORE_TIMER_DUMP #ifdef WANT_ECORE_TIMER_DUMP
# include <string.h> # include <string.h>
# include <execinfo.h> # include <execinfo.h>
@ -15,10 +26,10 @@
typedef void (*Ecore_Timer_Bt_Func)(); typedef void (*Ecore_Timer_Bt_Func)();
#endif #endif
struct _Ecore_Timer struct _Ecore_Timer_Private_Data
{ {
EINA_INLIST; EINA_INLIST;
ECORE_MAGIC; Ecore_Timer *obj;
double in; double in;
double at; double at;
double pending; double pending;
@ -35,9 +46,10 @@ struct _Ecore_Timer
unsigned char just_added : 1; unsigned char just_added : 1;
unsigned char frozen : 1; unsigned char frozen : 1;
}; };
GENERIC_ALLOC_SIZE_DECLARE(Ecore_Timer);
static void _ecore_timer_set(Ecore_Timer *timer, typedef struct _Ecore_Timer_Private_Data Ecore_Timer_Private_Data;
static void _ecore_timer_set(Ecore_Timer *timer,
double at, double at,
double in, double in,
Ecore_Task_Cb func, Ecore_Task_Cb func,
@ -49,9 +61,9 @@ static int _ecore_timer_cmp(const void *d1,
static int timers_added = 0; static int timers_added = 0;
static int timers_delete_me = 0; static int timers_delete_me = 0;
static Ecore_Timer *timers = NULL; static Ecore_Timer_Private_Data *timers = NULL;
static Ecore_Timer *timer_current = NULL; static Ecore_Timer_Private_Data *timer_current = NULL;
static Ecore_Timer *suspended = NULL; static Ecore_Timer_Private_Data *suspended = NULL;
static double last_check = 0.0; static double last_check = 0.0;
static double precision = 10.0 / 1000000.0; static double precision = 10.0 / 1000000.0;
@ -138,29 +150,89 @@ ecore_timer_add(double in,
Ecore_Task_Cb func, Ecore_Task_Cb func,
const void *data) const void *data)
{ {
double now;
Ecore_Timer *timer = NULL; Ecore_Timer *timer = NULL;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
_ecore_lock(); timer = eo_add_custom(MY_CLASS, _ecore_parent, ecore_timer_constructor(in, func, data));
if (!func) goto unlock; eo_unref(timer);
return timer;
}
static Eina_Bool
_ecore_timer_add(Ecore_Timer *obj,
Ecore_Timer_Private_Data *timer,
double now,
double in,
Ecore_Task_Cb func,
const void *data)
{
if (EINA_UNLIKELY(!eina_main_loop_is()))
{
eo_error_set(obj);
EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE);
}
timer->obj = obj;
eo_do_super(obj, eo_constructor());
eo_manual_free_set(obj, EINA_TRUE);
if (!func)
{
eo_error_set(obj);
ERR("callback function must be set up for an object of class: '%s'", MY_CLASS_NAME);
return EINA_FALSE;
}
if (in < 0.0) in = 0.0; if (in < 0.0) in = 0.0;
timer = ecore_timer_calloc(1);
if (!timer) goto unlock;
ECORE_MAGIC_SET(timer, ECORE_MAGIC_TIMER);
now = ecore_time_get();
#ifdef WANT_ECORE_TIMER_DUMP #ifdef WANT_ECORE_TIMER_DUMP
timer->timer_bt_num = backtrace((void **)(timer->timer_bt), timer->timer_bt_num = backtrace((void **)(timer->timer_bt),
ECORE_TIMER_DEBUG_BT_NUM); ECORE_TIMER_DEBUG_BT_NUM);
#endif #endif
_ecore_timer_set(obj, now + in, in, func, (void *)data);
_ecore_timer_set(timer, now + in, in, func, (void *)data); return EINA_TRUE;
unlock:
_ecore_unlock();
return timer;
} }
static void
_timer_constructor(Eo *obj, void *_pd, va_list *list)
{
double in = va_arg(*list, double);
Ecore_Task_Cb func = va_arg(*list, Ecore_Task_Cb);
const void *data = va_arg(*list, const void *);
double now;
_ecore_lock();
now = ecore_time_get();
Ecore_Timer_Private_Data *timer = _pd;
_ecore_timer_add(obj, timer, now, in, func, data);
_ecore_unlock();
}
static void
_timer_loop_constructor(Eo *obj, void *_pd, va_list *list)
{
double in = va_arg(*list, double);
Ecore_Task_Cb func = va_arg(*list, Ecore_Task_Cb);
const void *data = va_arg(*list, const void *);
double now;
_ecore_lock();
now = ecore_loop_time_get();
Ecore_Timer_Private_Data *timer = _pd;
_ecore_timer_add(obj, timer, now, in, func, data);
}
static void
_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
{
eo_error_set(obj);
ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME);
}
/** /**
* Creates a timer to call the given function in the given period of time. * Creates a timer to call the given function in the given period of time.
* @param in The interval in seconds from current loop time. * @param in The interval in seconds from current loop time.
@ -180,7 +252,6 @@ ecore_timer_loop_add(double in,
{ {
Ecore_Timer *timer; Ecore_Timer *timer;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
_ecore_lock(); _ecore_lock();
timer = _ecore_timer_loop_add(in, func, data); timer = _ecore_timer_loop_add(in, func, data);
_ecore_unlock(); _ecore_unlock();
@ -205,16 +276,8 @@ ecore_timer_del(Ecore_Timer *timer)
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
_ecore_lock(); _ecore_lock();
if (!ECORE_MAGIC_CHECK(timer, ECORE_MAGIC_TIMER))
{
ECORE_MAGIC_FAIL(timer, ECORE_MAGIC_TIMER,
"ecore_timer_del");
goto unlock;
}
data = _ecore_timer_del(timer); data = _ecore_timer_del(timer);
unlock:
_ecore_unlock(); _ecore_unlock();
return data; return data;
} }
@ -229,18 +292,21 @@ unlock:
EAPI void EAPI void
ecore_timer_interval_set(Ecore_Timer *timer, ecore_timer_interval_set(Ecore_Timer *timer,
double in) double in)
{
ECORE_TIMER_CHECK(timer);
eo_do(timer, ecore_obj_timer_interval_set(in));
}
static void
_timer_interval_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
{ {
EINA_MAIN_LOOP_CHECK_RETURN; EINA_MAIN_LOOP_CHECK_RETURN;
_ecore_lock(); double in = va_arg(*list, double);
if (in < 0.0) in = 0.0; if (in < 0.0) in = 0.0;
if (!ECORE_MAGIC_CHECK(timer, ECORE_MAGIC_TIMER)) Ecore_Timer_Private_Data *timer = _pd;
{
ECORE_MAGIC_FAIL(timer, ECORE_MAGIC_TIMER, _ecore_lock();
"ecore_timer_interval_set");
goto unlock;
}
timer->in = in; timer->in = in;
unlock:
_ecore_unlock(); _ecore_unlock();
} }
@ -253,25 +319,26 @@ unlock:
EAPI double EAPI double
ecore_timer_interval_get(Ecore_Timer *timer) ecore_timer_interval_get(Ecore_Timer *timer)
{ {
double interval; double interval = -1.0;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(0.0); ECORE_TIMER_CHECK(timer) interval;
_ecore_lock(); eo_do(timer, ecore_obj_timer_interval_get(&interval));
if (!ECORE_MAGIC_CHECK(timer, ECORE_MAGIC_TIMER))
{
ECORE_MAGIC_FAIL(timer, ECORE_MAGIC_TIMER,
"ecore_timer_interval_get");
interval = -1.0;
goto unlock;
}
interval = timer->in;
unlock:
_ecore_unlock();
return interval; return interval;
} }
static void
_timer_interval_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
{
double *ret = va_arg(*list, double *);
*ret = -1.0;
EINA_MAIN_LOOP_CHECK_RETURN;
Ecore_Timer_Private_Data *timer = _pd;
_ecore_lock();
*ret = timer->in;
_ecore_unlock();
}
/** /**
* Add some delay for the next occurrence of a timer. * Add some delay for the next occurrence of a timer.
* This doesn't affect the interval of a timer. * This doesn't affect the interval of a timer.
@ -283,16 +350,18 @@ EAPI void
ecore_timer_delay(Ecore_Timer *timer, ecore_timer_delay(Ecore_Timer *timer,
double add) double add)
{ {
ECORE_TIMER_CHECK(timer);
eo_do(timer, ecore_obj_timer_delay(add));
}
static void
_timer_delay(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
double add = va_arg(*list, double);
EINA_MAIN_LOOP_CHECK_RETURN; EINA_MAIN_LOOP_CHECK_RETURN;
if (!ECORE_MAGIC_CHECK(timer, ECORE_MAGIC_TIMER))
{
ECORE_MAGIC_FAIL(timer, ECORE_MAGIC_TIMER,
"ecore_timer_delay");
return;
}
_ecore_lock(); _ecore_lock();
_ecore_timer_delay(timer, add); _ecore_timer_delay(obj, add);
_ecore_unlock(); _ecore_unlock();
} }
@ -308,15 +377,19 @@ ecore_timer_delay(Ecore_Timer *timer,
*/ */
EAPI void EAPI void
ecore_timer_reset(Ecore_Timer *timer) ecore_timer_reset(Ecore_Timer *timer)
{
ECORE_TIMER_CHECK(timer);
eo_do(timer, ecore_obj_timer_reset());
}
static void
_timer_reset(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{ {
double now, add; double now, add;
EINA_MAIN_LOOP_CHECK_RETURN; EINA_MAIN_LOOP_CHECK_RETURN;
if (!ECORE_MAGIC_CHECK(timer, ECORE_MAGIC_TIMER))
{ Ecore_Timer_Private_Data *timer = _pd;
ECORE_MAGIC_FAIL(timer, ECORE_MAGIC_TIMER,
__func__);
return;
}
_ecore_lock(); _ecore_lock();
now = ecore_time_get(); now = ecore_time_get();
@ -324,7 +397,7 @@ ecore_timer_reset(Ecore_Timer *timer)
add = timer->pending; add = timer->pending;
else else
add = timer->at - now; add = timer->at - now;
_ecore_timer_delay(timer, timer->in - add); _ecore_timer_delay(obj, timer->in - add);
_ecore_unlock(); _ecore_unlock();
} }
@ -338,30 +411,33 @@ ecore_timer_reset(Ecore_Timer *timer)
EAPI double EAPI double
ecore_timer_pending_get(Ecore_Timer *timer) ecore_timer_pending_get(Ecore_Timer *timer)
{ {
double now;
double ret = 0.0; double ret = 0.0;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(0.0); ECORE_TIMER_CHECK(timer) ret;
_ecore_lock(); eo_do(timer, ecore_obj_timer_pending_get(&ret));
return ret;
}
if (!ECORE_MAGIC_CHECK(timer, ECORE_MAGIC_TIMER)) static void
{ _timer_pending_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
ECORE_MAGIC_FAIL(timer, ECORE_MAGIC_TIMER, {
"ecore_timer_pending_get"); double now;
goto unlock; double *ret = va_arg(*list, double *);
} *ret = 0.0;
EINA_MAIN_LOOP_CHECK_RETURN;
_ecore_lock();
Ecore_Timer_Private_Data *timer = _pd;
now = ecore_time_get(); now = ecore_time_get();
if (timer->frozen) if (timer->frozen)
ret = timer->pending; *ret = timer->pending;
else else
ret = timer->at - now; *ret = timer->at - now;
unlock:
_ecore_unlock(); _ecore_unlock();
return ret;
} }
/** /**
* Pauses a running timer. * Pauses a running timer.
* *
@ -378,25 +454,27 @@ unlock:
*/ */
EAPI void EAPI void
ecore_timer_freeze(Ecore_Timer *timer) ecore_timer_freeze(Ecore_Timer *timer)
{
ECORE_TIMER_CHECK(timer);
eo_do(timer, eo_event_freeze());
}
static void
_timer_freeze(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_UNUSED)
{ {
double now; double now;
EINA_MAIN_LOOP_CHECK_RETURN; EINA_MAIN_LOOP_CHECK_RETURN;
_ecore_lock();
if (!ECORE_MAGIC_CHECK(timer, ECORE_MAGIC_TIMER)) Ecore_Timer_Private_Data *timer = _pd;
{ _ecore_lock();
ECORE_MAGIC_FAIL(timer, ECORE_MAGIC_TIMER,
"ecore_timer_freeze");
goto unlock;
}
/* Timer already frozen */ /* Timer already frozen */
if (timer->frozen) if (timer->frozen)
goto unlock; goto unlock;
timers = (Ecore_Timer *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer)); timers = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer));
suspended = (Ecore_Timer *)eina_inlist_prepend(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer)); suspended = (Ecore_Timer_Private_Data *)eina_inlist_prepend(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer));
now = ecore_time_get(); now = ecore_time_get();
@ -422,27 +500,29 @@ unlock:
*/ */
EAPI void EAPI void
ecore_timer_thaw(Ecore_Timer *timer) ecore_timer_thaw(Ecore_Timer *timer)
{
ECORE_TIMER_CHECK(timer);
eo_do(timer, eo_event_thaw());
}
static void
_timer_thaw(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{ {
double now; double now;
EINA_MAIN_LOOP_CHECK_RETURN; EINA_MAIN_LOOP_CHECK_RETURN;
_ecore_lock(); Ecore_Timer_Private_Data *timer = _pd;
if (!ECORE_MAGIC_CHECK(timer, ECORE_MAGIC_TIMER)) _ecore_lock();
{
ECORE_MAGIC_FAIL(timer, ECORE_MAGIC_TIMER,
"ecore_timer_thaw");
goto unlock;
}
/* Timer not frozen */ /* Timer not frozen */
if (!timer->frozen) if (!timer->frozen)
goto unlock; goto unlock;
suspended = (Ecore_Timer *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer)); suspended = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer));
now = ecore_time_get(); now = ecore_time_get();
_ecore_timer_set(timer, timer->pending + now, timer->in, timer->func, timer->data); _ecore_timer_set(obj, timer->pending + now, timer->in, timer->func, timer->data);
unlock: unlock:
_ecore_unlock(); _ecore_unlock();
} }
@ -512,52 +592,50 @@ _ecore_timer_loop_add(double in,
Ecore_Task_Cb func, Ecore_Task_Cb func,
const void *data) const void *data)
{ {
double now;
Ecore_Timer *timer = NULL; Ecore_Timer *timer = NULL;
timer = eo_add_custom(MY_CLASS, _ecore_parent, ecore_timer_loop_constructor(in, func, data));
eo_unref(timer);
if (!func) return timer;
if (in < 0.0) in = 0.0;
timer = ecore_timer_calloc(1);
if (!timer) return timer;
ECORE_MAGIC_SET(timer, ECORE_MAGIC_TIMER);
now = ecore_loop_time_get();
#ifdef WANT_ECORE_TIMER_DUMP
timer->timer_bt_num = backtrace((void **)(timer->timer_bt),
ECORE_TIMER_DEBUG_BT_NUM);
#endif
_ecore_timer_set(timer, now + in, in, func, (void *)data);
return timer; return timer;
} }
EAPI void EAPI void
_ecore_timer_delay(Ecore_Timer *timer, _ecore_timer_delay(Ecore_Timer *obj,
double add) double add)
{ {
Ecore_Timer_Private_Data *timer = eo_data_get(obj, MY_CLASS);
if (timer->frozen) if (timer->frozen)
{ {
timer->pending += add; timer->pending += add;
} }
else else
{ {
timers = (Ecore_Timer *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer)); timers = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer));
_ecore_timer_set(timer, timer->at + add, timer->in, timer->func, timer->data); _ecore_timer_set(obj, timer->at + add, timer->in, timer->func, timer->data);
} }
} }
void * void *
_ecore_timer_del(Ecore_Timer *timer) _ecore_timer_del(Ecore_Timer *obj)
{ {
Ecore_Timer_Private_Data *timer = eo_data_get(obj, MY_CLASS);
if (timer->frozen && !timer->references) if (timer->frozen && !timer->references)
{ {
void *data = timer->data; void *data = timer->data;
suspended = (Ecore_Timer *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer)); suspended = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer));
if (timer->delete_me) if (timer->delete_me)
timers_delete_me--; timers_delete_me--;
ecore_timer_mp_free(timer); eo_parent_set(obj, NULL);
if (eo_destructed_is(obj))
eo_manual_free(obj);
else
eo_manual_free_set(obj, EINA_FALSE);
return data; return data;
} }
@ -567,23 +645,45 @@ _ecore_timer_del(Ecore_Timer *timer)
return timer->data; return timer->data;
} }
static void
_destructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Ecore_Timer_Private_Data *pd = _pd;
if (!pd->delete_me)
{
pd->delete_me = 1;
timers_delete_me++;
}
eo_do_super(obj, eo_destructor());
}
void void
_ecore_timer_shutdown(void) _ecore_timer_shutdown(void)
{ {
Ecore_Timer *timer; Ecore_Timer_Private_Data *timer;
while ((timer = timers)) while ((timer = timers))
{ {
timers = (Ecore_Timer *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timers)); timers = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timers));
ECORE_MAGIC_SET(timer, ECORE_MAGIC_NONE);
ecore_timer_mp_free(timer); eo_parent_set(timer->obj, NULL);
if (eo_destructed_is(timer->obj))
eo_manual_free(timer->obj);
else
eo_manual_free_set(timer->obj, EINA_FALSE);
} }
while ((timer = suspended)) while ((timer = suspended))
{ {
suspended = (Ecore_Timer *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(suspended)); suspended = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(suspended));
ECORE_MAGIC_SET(timer, ECORE_MAGIC_NONE);
ecore_timer_mp_free(timer); eo_parent_set(timer->obj, NULL);
if (eo_destructed_is(timer->obj))
eo_manual_free(timer->obj);
else
eo_manual_free_set(timer->obj, EINA_FALSE);
} }
timer_current = NULL; timer_current = NULL;
@ -592,15 +692,15 @@ _ecore_timer_shutdown(void)
void void
_ecore_timer_cleanup(void) _ecore_timer_cleanup(void)
{ {
Ecore_Timer *l; Ecore_Timer_Private_Data *l;
int in_use = 0, todo = timers_delete_me, done = 0; int in_use = 0, todo = timers_delete_me, done = 0;
if (!timers_delete_me) return; if (!timers_delete_me) return;
for (l = timers; l; ) for (l = timers; l; )
{ {
Ecore_Timer *timer = l; Ecore_Timer_Private_Data *timer = l;
l = (Ecore_Timer *)EINA_INLIST_GET(l)->next; l = (Ecore_Timer_Private_Data *)EINA_INLIST_GET(l)->next;
if (timer->delete_me) if (timer->delete_me)
{ {
if (timer->references) if (timer->references)
@ -608,9 +708,13 @@ _ecore_timer_cleanup(void)
in_use++; in_use++;
continue; continue;
} }
timers = (Ecore_Timer *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer)); timers = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer));
ECORE_MAGIC_SET(timer, ECORE_MAGIC_NONE);
ecore_timer_mp_free(timer); eo_parent_set(timer->obj, NULL);
if (eo_destructed_is(timer->obj))
eo_manual_free(timer->obj);
else
eo_manual_free_set(timer->obj, EINA_FALSE);
timers_delete_me--; timers_delete_me--;
done++; done++;
if (timers_delete_me == 0) return; if (timers_delete_me == 0) return;
@ -618,9 +722,9 @@ _ecore_timer_cleanup(void)
} }
for (l = suspended; l; ) for (l = suspended; l; )
{ {
Ecore_Timer *timer = l; Ecore_Timer_Private_Data *timer = l;
l = (Ecore_Timer *)EINA_INLIST_GET(l)->next; l = (Ecore_Timer_Private_Data *)EINA_INLIST_GET(l)->next;
if (timer->delete_me) if (timer->delete_me)
{ {
if (timer->references) if (timer->references)
@ -628,9 +732,13 @@ _ecore_timer_cleanup(void)
in_use++; in_use++;
continue; continue;
} }
suspended = (Ecore_Timer *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer)); suspended = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer));
ECORE_MAGIC_SET(timer, ECORE_MAGIC_NONE);
ecore_timer_mp_free(timer); eo_parent_set(timer->obj, NULL);
if (eo_destructed_is(timer->obj))
eo_manual_free(timer->obj);
else
eo_manual_free_set(timer->obj, EINA_FALSE);
timers_delete_me--; timers_delete_me--;
done++; done++;
if (timers_delete_me == 0) return; if (timers_delete_me == 0) return;
@ -650,7 +758,7 @@ _ecore_timer_cleanup(void)
void void
_ecore_timer_enable_new(void) _ecore_timer_enable_new(void)
{ {
Ecore_Timer *timer; Ecore_Timer_Private_Data *timer;
if (!timers_added) return; if (!timers_added) return;
timers_added = 0; timers_added = 0;
@ -660,10 +768,10 @@ _ecore_timer_enable_new(void)
int int
_ecore_timers_exists(void) _ecore_timers_exists(void)
{ {
Ecore_Timer *timer = timers; Ecore_Timer_Private_Data *timer = timers;
while ((timer) && (timer->delete_me)) while ((timer) && (timer->delete_me))
timer = (Ecore_Timer *)EINA_INLIST_GET(timer)->next; timer = (Ecore_Timer_Private_Data *)EINA_INLIST_GET(timer)->next;
return !!timer; return !!timer;
} }
@ -671,29 +779,37 @@ _ecore_timers_exists(void)
static inline Ecore_Timer * static inline Ecore_Timer *
_ecore_timer_first_get(void) _ecore_timer_first_get(void)
{ {
Ecore_Timer *timer = timers; Ecore_Timer *ret = NULL;
Ecore_Timer_Private_Data *timer = timers;
while ((timer) && ((timer->delete_me) || (timer->just_added))) while ((timer) && ((timer->delete_me) || (timer->just_added)))
timer = (Ecore_Timer *)EINA_INLIST_GET(timer)->next; timer = (Ecore_Timer_Private_Data *)EINA_INLIST_GET(timer)->next;
return timer; if (timer)
ret = timer->obj;
return ret;
} }
static inline Ecore_Timer * static inline Ecore_Timer *
_ecore_timer_after_get(Ecore_Timer *base) _ecore_timer_after_get(Ecore_Timer *obj)
{ {
Ecore_Timer *timer = (Ecore_Timer *)EINA_INLIST_GET(base)->next; Ecore_Timer *ret = NULL;
Ecore_Timer *valid_timer = NULL; Ecore_Timer_Private_Data *base = eo_data_get(obj, MY_CLASS);
Ecore_Timer_Private_Data *timer = (Ecore_Timer_Private_Data *)EINA_INLIST_GET(base)->next;
Ecore_Timer_Private_Data *valid_timer = NULL;
double maxtime = base->at + precision; double maxtime = base->at + precision;
while ((timer) && (timer->at < maxtime)) while ((timer) && (timer->at < maxtime))
{ {
if (!((timer->delete_me) || (timer->just_added))) if (!((timer->delete_me) || (timer->just_added)))
valid_timer = timer; valid_timer = timer;
timer = (Ecore_Timer *)EINA_INLIST_GET(timer)->next; timer = (Ecore_Timer_Private_Data *)EINA_INLIST_GET(timer)->next;
} }
return valid_timer; if (valid_timer)
ret = valid_timer->obj;
return ret;
} }
double double
@ -701,13 +817,16 @@ _ecore_timer_next_get(void)
{ {
double now; double now;
double in; double in;
Ecore_Timer *first, *second; Ecore_Timer *first_obj, *second_obj;
Ecore_Timer_Private_Data *first;
first = _ecore_timer_first_get(); first_obj = _ecore_timer_first_get();
if (!first) return -1; if (!first_obj) return -1;
second = _ecore_timer_after_get(first); second_obj = _ecore_timer_after_get(first_obj);
if (second) first = second; if (second_obj) first_obj = second_obj;
first = eo_data_get(first_obj, MY_CLASS);
now = ecore_loop_time_get(); now = ecore_loop_time_get();
in = first->at - now; in = first->at - now;
@ -716,12 +835,13 @@ _ecore_timer_next_get(void)
} }
static inline void static inline void
_ecore_timer_reschedule(Ecore_Timer *timer, _ecore_timer_reschedule(Ecore_Timer *obj,
double when) double when)
{ {
Ecore_Timer_Private_Data *timer = eo_data_get(obj, MY_CLASS);
if ((timer->delete_me) || (timer->frozen)) return; if ((timer->delete_me) || (timer->frozen)) return;
timers = (Ecore_Timer *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer)); timers = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer));
/* if the timer would have gone off more than 15 seconds ago, /* if the timer would have gone off more than 15 seconds ago,
* assume that the system hung and set the timer to go off * assume that the system hung and set the timer to go off
@ -733,9 +853,9 @@ _ecore_timer_reschedule(Ecore_Timer *timer,
* really slow within the main loop. * really slow within the main loop.
*/ */
if ((timer->at + timer->in) < (when - 15.0)) if ((timer->at + timer->in) < (when - 15.0))
_ecore_timer_set(timer, when + timer->in, timer->in, timer->func, timer->data); _ecore_timer_set(obj, when + timer->in, timer->in, timer->func, timer->data);
else else
_ecore_timer_set(timer, timer->at + timer->in, timer->in, timer->func, timer->data); _ecore_timer_set(obj, timer->at + timer->in, timer->in, timer->func, timer->data);
} }
/* assume that we hold the ecore lock when entering this function */ /* assume that we hold the ecore lock when entering this function */
@ -753,7 +873,7 @@ _ecore_timer_expired_call(double when)
if (!timers) return 0; if (!timers) return 0;
if (last_check > when) if (last_check > when)
{ {
Ecore_Timer *timer; Ecore_Timer_Private_Data *timer;
/* User set time backwards */ /* User set time backwards */
EINA_INLIST_FOREACH(timers, timer) timer->at -= (last_check - when); EINA_INLIST_FOREACH(timers, timer) timer->at -= (last_check - when);
} }
@ -762,19 +882,19 @@ _ecore_timer_expired_call(double when)
if (!timer_current) if (!timer_current)
{ {
/* regular main loop, start from head */ /* regular main loop, start from head */
timer_current = timers; timer_current = timers;
} }
else else
{ {
/* recursive main loop, continue from where we were */ /* recursive main loop, continue from where we were */
Ecore_Timer *timer_old = timer_current; Ecore_Timer_Private_Data *timer_old = timer_current;
timer_current = (Ecore_Timer *)EINA_INLIST_GET(timer_current)->next; timer_current = (Ecore_Timer_Private_Data *)EINA_INLIST_GET(timer_current)->next;
_ecore_timer_reschedule(timer_old, when); _ecore_timer_reschedule(timer_old->obj, when);
} }
while (timer_current) while (timer_current)
{ {
Ecore_Timer *timer = timer_current; Ecore_Timer_Private_Data *timer = timer_current;
if (timer->at > when) if (timer->at > when)
{ {
@ -784,33 +904,35 @@ _ecore_timer_expired_call(double when)
if ((timer->just_added) || (timer->delete_me)) if ((timer->just_added) || (timer->delete_me))
{ {
timer_current = (Ecore_Timer *)EINA_INLIST_GET(timer_current)->next; timer_current = (Ecore_Timer_Private_Data *)EINA_INLIST_GET(timer_current)->next;
continue; continue;
} }
timer->references++; timer->references++;
if (!_ecore_call_task_cb(timer->func, timer->data)) if (!_ecore_call_task_cb(timer->func, timer->data))
{ {
if (!timer->delete_me) _ecore_timer_del(timer); if (!timer->delete_me) _ecore_timer_del(timer->obj);
} }
timer->references--; timer->references--;
if (timer_current) /* may have changed in recursive main loops */ if (timer_current) /* may have changed in recursive main loops */
timer_current = (Ecore_Timer *)EINA_INLIST_GET(timer_current)->next; timer_current = (Ecore_Timer_Private_Data *)EINA_INLIST_GET(timer_current)->next;
_ecore_timer_reschedule(timer, when); _ecore_timer_reschedule(timer->obj, when);
} }
return 0; return 0;
} }
static void static void
_ecore_timer_set(Ecore_Timer *timer, _ecore_timer_set(Ecore_Timer *obj,
double at, double at,
double in, double in,
Ecore_Task_Cb func, Ecore_Task_Cb func,
void *data) void *data)
{ {
Ecore_Timer *t2; Ecore_Timer_Private_Data *t2;
Ecore_Timer_Private_Data *timer = eo_data_get(obj, MY_CLASS);
timers_added = 1; timers_added = 1;
timer->at = at; timer->at = at;
@ -826,12 +948,12 @@ _ecore_timer_set(Ecore_Timer *timer,
{ {
if (timer->at > t2->at) if (timer->at > t2->at)
{ {
timers = (Ecore_Timer *)eina_inlist_append_relative(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer), EINA_INLIST_GET(t2)); timers = (Ecore_Timer_Private_Data *)eina_inlist_append_relative(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer), EINA_INLIST_GET(t2));
return; return;
} }
} }
} }
timers = (Ecore_Timer *)eina_inlist_prepend(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer)); timers = (Ecore_Timer_Private_Data *)eina_inlist_prepend(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer));
} }
#ifdef WANT_ECORE_TIMER_DUMP #ifdef WANT_ECORE_TIMER_DUMP
@ -845,3 +967,50 @@ _ecore_timer_cmp(const void *d1,
return (int)((t1->in - t2->in) * 100); return (int)((t1->in - t2->in) * 100);
} }
#endif #endif
static void
_class_constructor(Eo_Class *klass)
{
const Eo_Op_Func_Description func_desc[] = {
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor),
EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_CONSTRUCTOR), _timer_constructor),
EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR), _timer_loop_constructor),
EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_SET), _timer_interval_set),
EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_GET), _timer_interval_get),
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_EVENT_FREEZE), _timer_freeze),
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_EVENT_THAW), _timer_thaw),
EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_DELAY), _timer_delay),
EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_RESET), _timer_reset),
EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_PENDING_GET), _timer_pending_get),
EO_OP_FUNC_SENTINEL
};
eo_class_funcs_set(klass, func_desc);
}
static const Eo_Op_Description op_desc[] = {
EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_CONSTRUCTOR, "Creates a timer to call the given function in the given period of time."),
EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR, "Creates a timer to call the given function in the given period of time."),
EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_INTERVAL_SET, "Change the interval the timer ticks of."),
EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_INTERVAL_GET, "Get the interval the timer ticks on."),
EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_DELAY, "Add some delay for the next occurrence of a timer."),
EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_RESET, "Reset a timer to its full interval"),
EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_PENDING_GET, "Get the pending time regarding a timer."),
EO_OP_DESCRIPTION_SENTINEL
};
static const Eo_Class_Description class_desc = {
EO_VERSION,
MY_CLASS_NAME,
EO_CLASS_TYPE_REGULAR,
EO_CLASS_DESCRIPTION_OPS(&ECORE_TIMER_BASE_ID, op_desc, ECORE_TIMER_SUB_ID_LAST),
NULL,
sizeof(Ecore_Timer_Private_Data),
_class_constructor,
NULL
};
EO_DEFINE_CLASS(ecore_timer_class_get, &class_desc, EO_BASE_CLASS, NULL)