summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2016-04-21 15:11:32 -0700
committerCedric BAIL <cedric@osg.samsung.com>2016-04-21 15:11:32 -0700
commit454722cf6fd0ad512770d88e612f6c8df3a6149e (patch)
tree0637043c24329d1872e26955e835777f3ef967bd
parent9efefb1f2e97c884c7f7b33c90267413e743260d (diff)
ecore: rename Ecore_Mainloop to Efl.Loop.
-rw-r--r--src/Makefile_Ecore.am2
-rw-r--r--src/lib/ecore/Ecore_Eo.h2
-rw-r--r--src/lib/ecore/ecore_idle_enterer.c4
-rw-r--r--src/lib/ecore/ecore_idle_exiter.c4
-rw-r--r--src/lib/ecore/ecore_idler.c6
-rw-r--r--src/lib/ecore/ecore_main.c26
-rw-r--r--src/lib/ecore/ecore_private.h4
-rw-r--r--src/lib/ecore/efl_loop.eo (renamed from src/lib/ecore/ecore_mainloop.eo)15
8 files changed, 32 insertions, 31 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index e3aa651..58df14b 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -10,7 +10,7 @@ ecore_eolian_files_legacy = \
10 10
11ecore_eolian_files = \ 11ecore_eolian_files = \
12 $(ecore_eolian_files_legacy) \ 12 $(ecore_eolian_files_legacy) \
13 lib/ecore/ecore_mainloop.eo \ 13 lib/ecore/efl_loop.eo \
14 lib/ecore/ecore_parent.eo 14 lib/ecore/ecore_parent.eo
15 15
16ecore_eolian_type_files = \ 16ecore_eolian_type_files = \
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index fa256b9..04bc2f6 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -72,7 +72,7 @@ extern "C" {
72 * @{ 72 * @{
73 */ 73 */
74 74
75#include "ecore_mainloop.eo.h" 75#include "efl_loop.eo.h"
76 76
77/* We ue the factory pattern here, so you shouldn't call eo_add directly. */ 77/* We ue the factory pattern here, so you shouldn't call eo_add directly. */
78EAPI Eo *ecore_main_loop_get(void); 78EAPI Eo *ecore_main_loop_get(void);
diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c
index 5bcbab8..0cefb05 100644
--- a/src/lib/ecore/ecore_idle_enterer.c
+++ b/src/lib/ecore/ecore_idle_enterer.c
@@ -10,7 +10,7 @@
10#include "ecore_private.h" 10#include "ecore_private.h"
11 11
12EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_enterer_callbacks, 12EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_enterer_callbacks,
13 { ECORE_MAINLOOP_EVENT_IDLE_ENTER, _ecore_factorized_idle_process }, 13 { EFL_LOOP_EVENT_IDLE_ENTER, _ecore_factorized_idle_process },
14 { EO_BASE_EVENT_DEL, _ecore_factorized_idle_event_del }); 14 { EO_BASE_EVENT_DEL, _ecore_factorized_idle_event_del });
15 15
16 16
@@ -45,5 +45,5 @@ ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer)
45void 45void
46_ecore_idle_enterer_call(Eo *loop) 46_ecore_idle_enterer_call(Eo *loop)
47{ 47{
48 eo_event_callback_call(loop, ECORE_MAINLOOP_EVENT_IDLE_ENTER, NULL); 48 eo_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_ENTER, NULL);
49} 49}
diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c
index 07660d6..acd7294 100644
--- a/src/lib/ecore/ecore_idle_exiter.c
+++ b/src/lib/ecore/ecore_idle_exiter.c
@@ -10,7 +10,7 @@
10#include "ecore_private.h" 10#include "ecore_private.h"
11 11
12EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_exiter_callbacks, 12EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_exiter_callbacks,
13 { ECORE_MAINLOOP_EVENT_IDLE_EXIT, _ecore_factorized_idle_process }, 13 { EFL_LOOP_EVENT_IDLE_EXIT, _ecore_factorized_idle_process },
14 { EO_BASE_EVENT_DEL, _ecore_factorized_idle_event_del }); 14 { EO_BASE_EVENT_DEL, _ecore_factorized_idle_event_del });
15 15
16EAPI Ecore_Idle_Exiter * 16EAPI Ecore_Idle_Exiter *
@@ -29,5 +29,5 @@ ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter)
29void 29void
30_ecore_idle_exiter_call(Eo *loop) 30_ecore_idle_exiter_call(Eo *loop)
31{ 31{
32 eo_event_callback_call(loop, ECORE_MAINLOOP_EVENT_IDLE_EXIT, NULL); 32 eo_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_EXIT, NULL);
33} 33}
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index db42928..97c0639 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -84,7 +84,7 @@ _ecore_factorized_idle_add(const Eo_Callback_Array_Item *desc,
84/* Specific to Ecore_Idler implementation */ 84/* Specific to Ecore_Idler implementation */
85 85
86EO_CALLBACKS_ARRAY_DEFINE(ecore_idler_callbacks, 86EO_CALLBACKS_ARRAY_DEFINE(ecore_idler_callbacks,
87 { ECORE_MAINLOOP_EVENT_IDLE, _ecore_factorized_idle_process }, 87 { EFL_LOOP_EVENT_IDLE, _ecore_factorized_idle_process },
88 { EO_BASE_EVENT_DEL, _ecore_factorized_idle_event_del }); 88 { EO_BASE_EVENT_DEL, _ecore_factorized_idle_event_del });
89 89
90EAPI Ecore_Idler * 90EAPI Ecore_Idler *
@@ -103,13 +103,13 @@ ecore_idler_del(Ecore_Idler *idler)
103void 103void
104_ecore_idler_all_call(Eo *loop) 104_ecore_idler_all_call(Eo *loop)
105{ 105{
106 eo_event_callback_call(loop, ECORE_MAINLOOP_EVENT_IDLE, NULL); 106 eo_event_callback_call(loop, EFL_LOOP_EVENT_IDLE, NULL);
107} 107}
108 108
109int 109int
110_ecore_idler_exist(Eo *loop) 110_ecore_idler_exist(Eo *loop)
111{ 111{
112 Ecore_Mainloop_Data *dt = eo_data_scope_get(loop, ECORE_MAINLOOP_CLASS); 112 Efl_Loop_Data *dt = eo_data_scope_get(loop, EFL_LOOP_CLASS);
113 113
114 return dt->idlers; 114 return dt->idlers;
115} 115}
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 6f8c5f1..fef3a1a 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -1160,7 +1160,7 @@ _ecore_main_loop_init(void)
1160 1160
1161 detect_time_changes_start(); 1161 detect_time_changes_start();
1162 1162
1163 _mainloop_singleton = eo_add(ECORE_MAINLOOP_CLASS, NULL); 1163 _mainloop_singleton = eo_add(EFL_LOOP_CLASS, NULL);
1164} 1164}
1165 1165
1166void 1166void
@@ -2719,31 +2719,31 @@ EAPI Eo *ecore_main_loop_get(void)
2719{ 2719{
2720 if (!_mainloop_singleton) 2720 if (!_mainloop_singleton)
2721 { 2721 {
2722 _mainloop_singleton = eo_add(ECORE_MAINLOOP_CLASS, NULL); 2722 _mainloop_singleton = eo_add(EFL_LOOP_CLASS, NULL);
2723 } 2723 }
2724 2724
2725 return _mainloop_singleton; 2725 return _mainloop_singleton;
2726} 2726}
2727 2727
2728EOLIAN static void 2728EOLIAN static void
2729_ecore_mainloop_iterate(Eo *obj EINA_UNUSED, Ecore_Mainloop_Data *pd EINA_UNUSED) 2729_efl_loop_iterate(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd EINA_UNUSED)
2730{ 2730{
2731 ecore_main_loop_iterate(); 2731 ecore_main_loop_iterate();
2732} 2732}
2733 2733
2734EOLIAN static int _ecore_mainloop_iterate_may_block(Eo *obj EINA_UNUSED, Ecore_Mainloop_Data *pd EINA_UNUSED, int may_block) 2734EOLIAN static int _efl_loop_iterate_may_block(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd EINA_UNUSED, int may_block)
2735{ 2735{
2736 return ecore_main_loop_iterate_may_block(may_block); 2736 return ecore_main_loop_iterate_may_block(may_block);
2737} 2737}
2738 2738
2739EOLIAN static void 2739EOLIAN static void
2740_ecore_mainloop_begin(Eo *obj EINA_UNUSED, Ecore_Mainloop_Data *pd EINA_UNUSED) 2740_efl_loop_begin(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd EINA_UNUSED)
2741{ 2741{
2742 ecore_main_loop_begin(); 2742 ecore_main_loop_begin();
2743} 2743}
2744 2744
2745EOLIAN static void 2745EOLIAN static void
2746_ecore_mainloop_quit(Eo *obj EINA_UNUSED, Ecore_Mainloop_Data *pd EINA_UNUSED) 2746_efl_loop_quit(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd EINA_UNUSED)
2747{ 2747{
2748 ecore_main_loop_quit(); 2748 ecore_main_loop_quit();
2749} 2749}
@@ -2752,12 +2752,12 @@ static Eina_Bool
2752_check_event_catcher_add(void *data, const Eo_Event *event) 2752_check_event_catcher_add(void *data, const Eo_Event *event)
2753{ 2753{
2754 const Eo_Callback_Array_Item *array = event->info; 2754 const Eo_Callback_Array_Item *array = event->info;
2755 Ecore_Mainloop_Data *pd = data; 2755 Efl_Loop_Data *pd = data;
2756 int i; 2756 int i;
2757 2757
2758 for (i = 0; array[i].desc != NULL; i++) 2758 for (i = 0; array[i].desc != NULL; i++)
2759 { 2759 {
2760 if (array[i].desc == ECORE_MAINLOOP_EVENT_IDLE) 2760 if (array[i].desc == EFL_LOOP_EVENT_IDLE)
2761 { 2761 {
2762 ++pd->idlers; 2762 ++pd->idlers;
2763 } 2763 }
@@ -2770,12 +2770,12 @@ static Eina_Bool
2770_check_event_catcher_del(void *data, const Eo_Event *event) 2770_check_event_catcher_del(void *data, const Eo_Event *event)
2771{ 2771{
2772 const Eo_Callback_Array_Item *array = event->info; 2772 const Eo_Callback_Array_Item *array = event->info;
2773 Ecore_Mainloop_Data *pd = data; 2773 Efl_Loop_Data *pd = data;
2774 int i; 2774 int i;
2775 2775
2776 for (i = 0; array[i].desc != NULL; i++) 2776 for (i = 0; array[i].desc != NULL; i++)
2777 { 2777 {
2778 if (array[i].desc == ECORE_MAINLOOP_EVENT_IDLE) 2778 if (array[i].desc == EFL_LOOP_EVENT_IDLE)
2779 { 2779 {
2780 --pd->idlers; 2780 --pd->idlers;
2781 } 2781 }
@@ -2789,12 +2789,12 @@ EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch,
2789 { EO_BASE_EVENT_CALLBACK_DEL, _check_event_catcher_del }); 2789 { EO_BASE_EVENT_CALLBACK_DEL, _check_event_catcher_del });
2790 2790
2791EOLIAN static Eo_Base * 2791EOLIAN static Eo_Base *
2792_ecore_mainloop_eo_base_constructor(Eo *obj, Ecore_Mainloop_Data *pd) 2792_efl_loop_eo_base_constructor(Eo *obj, Efl_Loop_Data *pd)
2793{ 2793{
2794 eo_constructor(eo_super(obj, ECORE_MAINLOOP_CLASS)); 2794 eo_constructor(eo_super(obj, EFL_LOOP_CLASS));
2795 eo_event_callback_array_add(obj, event_catcher_watch(), pd); 2795 eo_event_callback_array_add(obj, event_catcher_watch(), pd);
2796 2796
2797 return obj; 2797 return obj;
2798} 2798}
2799 2799
2800#include "ecore_mainloop.eo.c" 2800#include "efl_loop.eo.c"
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index 62c6578..76431d2 100644
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -87,8 +87,8 @@ extern int _ecore_log_dom;
87 87
88typedef struct _Ecore_Factorized_Idle Ecore_Factorized_Idle; 88typedef struct _Ecore_Factorized_Idle Ecore_Factorized_Idle;
89 89
90typedef struct _Ecore_Mainloop_Data Ecore_Mainloop_Data; 90typedef struct _Efl_Loop_Data Efl_Loop_Data;
91struct _Ecore_Mainloop_Data 91struct _Efl_Loop_Data
92{ 92{
93 int idlers; 93 int idlers;
94}; 94};
diff --git a/src/lib/ecore/ecore_mainloop.eo b/src/lib/ecore/efl_loop.eo
index 326890c..80fac0a 100644
--- a/src/lib/ecore/ecore_mainloop.eo
+++ b/src/lib/ecore/efl_loop.eo
@@ -1,13 +1,14 @@
1class Ecore_Mainloop (Eo.Base) 1class Efl.Loop (Eo.Base)
2{ 2{
3 [[The Ecore Main Loop 3 [[The Efl Main Loop
4 4
5 Ecore is a clean and tiny event loop library with many modules to do lots of 5 Efl main loop provide a clean and tiny event loop library with many modules to
6 convenient things for a programmer, to save time and effort. It's small and 6 do lots of convenient things for a programmer, to save time and effort. It's
7 lean, designed to work from embedded systems all the way up to large and 7 small and lean, designed to work from embedded systems all the way up to large
8 powerful multi-cpu workstations. The main loop has a number of primitives to 8 and powerful multi-cpu workstations. The main loop has a number of primitives to
9 be used with its main loop. It serializes all the primitives and allows for 9 be used with its main loop. It serializes all the primitives and allows for
10 great responsiveness without the need for threads(or any other concurrency). 10 great responsiveness without the need for threads (or any other concurrency), but
11 provide them if you need to.
11 ]] 12 ]]
12 legacy_prefix: null; 13 legacy_prefix: null;
13 methods { 14 methods {