summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2018-01-03 11:21:34 -0800
committerCedric BAIL <cedric@osg.samsung.com>2018-01-03 11:21:34 -0800
commitc19ef910201cc96dce4c7f21b57ce63868b980d0 (patch)
tree491766ccad08d4e7ff668bcd1d460a0ecc1124aa
parent8a10f09b14f046922ffe2e93bf58da41c3dd29bf (diff)
Revert "efl_loop: move scheduler_get to eo API"
This reverts commit f910ba248e3f8f8390674e79cbbe49582eed861e. The scheduler is meant to be used only in C, not by bindings so there isn't really a use for it in the loop class. Now this patch was triggered due to complexity in using future/promise, so will do a follow up patch to improve that.
-rw-r--r--src/lib/ecore/Ecore_Eo.h2
-rw-r--r--src/lib/ecore/efl_loop.c4
-rw-r--r--src/lib/ecore/efl_loop.eo11
-rw-r--r--src/lib/eo/eina_types.eot1
4 files changed, 3 insertions, 15 deletions
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index 290a8be701..77cc3d45e4 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -62,7 +62,7 @@ EAPI int efl_loop_exit_code_process(Eina_Value *value);
62 62
63#include "efl_loop_consumer.eo.h" 63#include "efl_loop_consumer.eo.h"
64 64
65EAPI Eina_Future_Scheduler *efl_loop_future_scheduler_get(const Eo *obj); 65EAPI Eina_Future_Scheduler *efl_loop_future_scheduler_get(Eo *obj);
66 66
67#include "efl_loop_fd.eo.h" 67#include "efl_loop_fd.eo.h"
68#include "efl_loop_handler.eo.h" 68#include "efl_loop_handler.eo.h"
diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index d02c993dd7..f77703e249 100644
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -714,8 +714,8 @@ _efl_loop_efl_version_get(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd EINA_UNUSED)
714 return &version; 714 return &version;
715} 715}
716 716
717EOLIAN static Eina_Future_Scheduler * 717EAPI Eina_Future_Scheduler *
718_efl_loop_future_scheduler_get(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED) 718efl_loop_future_scheduler_get(Eo *obj)
719{ 719{
720 if (!obj) return NULL; 720 if (!obj) return NULL;
721 721
diff --git a/src/lib/ecore/efl_loop.eo b/src/lib/ecore/efl_loop.eo
index e0de2b2bcf..c91709509a 100644
--- a/src/lib/ecore/efl_loop.eo
+++ b/src/lib/ecore/efl_loop.eo
@@ -47,17 +47,6 @@ class Efl.Loop (Efl.Object)
47 @cref version: Efl.Version; [[Efl version]] 47 @cref version: Efl.Version; [[Efl version]]
48 } 48 }
49 } 49 }
50 @property future_scheduler {
51 [[The future scheduler for the current loop.
52
53 If no future scheduler has been created for the loop then a new one
54 will be set up.
55 ]]
56 get {}
57 values {
58 future_scheduler: ptr(Eina.Future.Scheduler); [[The current loop' sfuture scheduler.]]
59 }
60 }
61 iterate { 50 iterate {
62 [[Runs a single iteration of the main loop to process everything on the 51 [[Runs a single iteration of the main loop to process everything on the
63 queue.]] 52 queue.]]
diff --git a/src/lib/eo/eina_types.eot b/src/lib/eo/eina_types.eot
index c7fbdf2d40..fc0fca09cc 100644
--- a/src/lib/eo/eina_types.eot
+++ b/src/lib/eo/eina_types.eot
@@ -79,5 +79,4 @@ struct @extern Eina.Rw_Slice {
79 79
80struct @extern Eina.Value.Type; [[Eina value type]] 80struct @extern Eina.Value.Type; [[Eina value type]]
81struct @extern Eina.Future; [[Eina_Future handle]] 81struct @extern Eina.Future; [[Eina_Future handle]]
82struct @extern Eina.Future.Scheduler; [[Eina_Future_Scheduler handle]]
83struct @extern Eina.Promise; [[Eina_Promise handle]] 82struct @extern Eina.Promise; [[Eina_Promise handle]]