cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c19ef910201cc96dce4c7f21b57ce63868b980d0
commit c19ef910201cc96dce4c7f21b57ce63868b980d0
Author: Cedric BAIL <ced...@osg.samsung.com>
Date: Wed Jan 3 11:21:34 2018 -0800
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.
---
src/lib/ecore/Ecore_Eo.h | 2 +-
src/lib/ecore/efl_loop.c | 4 ++--
src/lib/ecore/efl_loop.eo | 11 -----------
src/lib/eo/eina_types.eot | 1 -
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);
#include "efl_loop_consumer.eo.h"
-EAPI Eina_Future_Scheduler *efl_loop_future_scheduler_get(const Eo *obj);
+EAPI Eina_Future_Scheduler *efl_loop_future_scheduler_get(Eo *obj);
#include "efl_loop_fd.eo.h"
#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)
return &version;
}
-EOLIAN static Eina_Future_Scheduler *
-_efl_loop_future_scheduler_get(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED)
+EAPI Eina_Future_Scheduler *
+efl_loop_future_scheduler_get(Eo *obj)
{
if (!obj) return NULL;
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)
@cref version: Efl.Version; [[Efl version]]
}
}
- @property future_scheduler {
- [[The future scheduler for the current loop.
-
- If no future scheduler has been created for the loop then a new one
- will be set up.
- ]]
- get {}
- values {
- future_scheduler: ptr(Eina.Future.Scheduler); [[The current loop'
sfuture scheduler.]]
- }
- }
iterate {
[[Runs a single iteration of the main loop to process everything on
the
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 {
struct @extern Eina.Value.Type; [[Eina value type]]
struct @extern Eina.Future; [[Eina_Future handle]]
-struct @extern Eina.Future.Scheduler; [[Eina_Future_Scheduler handle]]
struct @extern Eina.Promise; [[Eina_Promise handle]]
--
