Revert "ecore: make efl_loop_promise_new a function of Efl.Loop_Consumer."

This reverts commit 9b5155c9f135f9ef450a817979f5884352b2d4c0.

For now lets revert this, this breaks copy and paste, further more it
has the potential to break a lot more things, as eio_model tends to use
efl_loop_promise new, and then eina_promise_data_set, which is
explicitly forbidden.

This fixes crashing terminology instances.

diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index fe9fe020612a8b7bef9ebc14c50fc078dd8d2ae8..ce3ecb7eb0840e75c707029a2fe2d6c0daab4dac 100644 (file)
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -66,6 +66,19 @@ EAPI int efl_loop_exit_code_process(Eina_Value *value);
  */
 EAPI Eina_Future_Scheduler *efl_loop_future_scheduler_get(const Eo *obj);
 
+/**
+ * @brief Create a promise attached to the current loop
+ *
+ * @param[in] An object which will provide a loop, either by being a loop or a loop consumer
+ * @param cancel_cb A callback used to inform that the promise was canceled. Use
+ * this callback to @c free @p data. @p cancel_cb must not be @c NULL !
+ * @param data Data to @p cancel_cb.
+ * @return A promise or @c NULL on error.
+ *
+ * @see eina_promise_new()
+ */
+EAPI Eina_Promise *efl_loop_promise_new(const Eo *obj, Eina_Promise_Cancel_Cb cancel_cb, const void *data);
+
 #include "efl_loop_fd.eo.h"
 #include "efl_loop_handler.eo.h"
 

diff --git a/src/lib/ecore/efl_exe.c b/src/lib/ecore/efl_exe.c
index e870fcaf1f7b53b155547ffc5c1aaee3f04c2c0c..254dd4c17a758d1b4c6ae2ae4ee03538bf059dfb 100644 (file)
--- a/src/lib/ecore/efl_exe.c
+++ b/src/lib/ecore/efl_exe.c
@@ -485,7 +485,7 @@ _efl_exe_efl_task_run(Eo *obj EINA_UNUSED, Efl_Exe_Data *pd)
                                               EFL_LOOP_HANDLER_FLAGS_READ));
         _ecore_signal_pid_unlock();
         pd->run = EINA_TRUE;
-        pd->promise = efl_loop_promise_new(obj, obj, _run_cancel_cb, NULL);
+        pd->promise = efl_loop_promise_new(obj, _run_cancel_cb, obj);
         return efl_future_then(obj, eina_future_new(pd->promise));
      }
    // this code is in the child here, and is temporary setup until we

diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index ab6d1983164aeac2939fc4ca829eb0827a4bfed1..1ef212f7314fd1161409be70ce2bee8eee502541 100644 (file)
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -902,4 +902,11 @@ efl_loop_future_scheduler_get(const Eo *obj)
 #define EFL_LOOP_EXTRA_OPS \
   EFL_OBJECT_OP_FUNC(efl_loop_message_process, _efl_loop_message_process)
 
+EAPI Eina_Promise *
+efl_loop_promise_new(const Eo *obj, Eina_Promise_Cancel_Cb cancel_cb, const void *data)
+{
+   return eina_promise_new(efl_loop_future_scheduler_get(obj),
+                           cancel_cb, data);
+}
+
 #include "efl_loop.eo.c"

diff --git a/src/lib/ecore/efl_loop_consumer.c b/src/lib/ecore/efl_loop_consumer.c
index f88c3e4473090438b202183bd5f0e14ad4798d12..29e94ed52d71e5ab29fd922d8689021117deee7d 100644 (file)
--- a/src/lib/ecore/efl_loop_consumer.c
+++ b/src/lib/ecore/efl_loop_consumer.c
@@ -50,51 +50,4 @@ _efl_loop_consumer_future_rejected(Eo *obj, Efl_Loop_Consumer_Data *pd EINA_UNUS
    return eina_future_rejected(efl_loop_future_scheduler_get(obj), error);
 }
 
-typedef struct _Efl_Loop_Consumer_Promise Efl_Loop_Consumer_Promise;
-struct _Efl_Loop_Consumer_Promise
-{
-   EflLoopConsumerPromiseCancel func;
-   Eina_Free_Cb free;
-   void *data;
-   Eo *obj;
-};
-
-static void
-_cancel_free(void *data)
-{
-   Efl_Loop_Consumer_Promise *lcp = data;
-
-   if (lcp->free) lcp->free(lcp->data);
-   efl_unref(lcp->obj);
-   free(lcp);
-}
-
-static void
-_cancel_triggered(void *data, const Eina_Promise *p)
-{
-   Efl_Loop_Consumer_Promise *lcp = data;
-
-   if (lcp->func) lcp->func(lcp->data, lcp->obj, p);
-}
-
-static Eina_Promise *
-_efl_loop_consumer_promise_new(Eo *obj, Efl_Loop_Consumer_Data *pd,
-                               void *cancel_data, EflLoopConsumerPromiseCancel cancel, Eina_Free_Cb cancel_free_cb)
-{
-   Efl_Loop_Consumer_Promise *lcp;
-   Eina_Promise *p;
-
-   lcp = calloc(1, sizeof (Efl_Loop_Consumer_Promise));
-   if (!lcp) return NULL;
-
-   lcp->func = cancel;
-   lcp->data = cancel_data;
-   lcp->free = cancel_free_cb;
-   lcp->obj = efl_ref(obj);
-
-   p = eina_promise_new(efl_loop_future_scheduler_get(obj), _cancel_triggered, lcp);
-   eina_promise_data_free_cb_set(p, _cancel_free);
-   return p;
-}
-
 #include "efl_loop_consumer.eo.c"

diff --git a/src/lib/ecore/efl_loop_consumer.eo b/src/lib/ecore/efl_loop_consumer.eo
index ed9d351faa3d4fd2ee6a0698abead0fc0578de12..4d7484e13c3e891836d51d8f9be8443b7e99183a 100644 (file)
--- a/src/lib/ecore/efl_loop_consumer.eo
+++ b/src/lib/ecore/efl_loop_consumer.eo
@@ -1,11 +1,3 @@
-function EflLoopConsumerPromiseCancel {
-   [[EflLoopConsumerPromiseCancel function callback called when a promise is cancelled.]]
-   params {
-      @in consumer: Efl.Loop_Consumer; [[The consumer that was used to create the promise.]]
-      @in dead_promise: const(ptr(Eina.Promise)); [[The promise that was just cancelled.]]
-   }
-};
-
 class Efl.Loop_Consumer (Efl.Object)
 {
    [[An Efl.Loop_Consumer is a class which requires one of the parents to provide
@@ -34,15 +26,6 @@ class Efl.Loop_Consumer (Efl.Object)
          }
          return: future<Eina.Error>;
       }
-      promise_new {
-         [[Create a new promise with the scheduler coming from the loop provided by this object.
-
-        Note: You should not use eina_promise_data_set as this function rely on controlling the promise data.]]
-         params {
-           cancel: EflLoopConsumerPromiseCancel; [[Callback called when the promise is being cancelled.]]
-        }
-        return: ptr(Eina.Promise) @owned; [[The new promise.]]
-      }
    }
    implements {
       Efl.Object.parent { set; }

diff --git a/src/lib/ecore/efl_thread.c b/src/lib/ecore/efl_thread.c
index c44e59b73a25f16212723afac573c472b4dd33e6..f72aa072316fba2369600b81ea9f7cd0512a35fc 100644 (file)
--- a/src/lib/ecore/efl_thread.c
+++ b/src/lib/ecore/efl_thread.c
@@ -412,7 +412,7 @@ _cb_thread_parent_ctrl_out(void *data, const Efl_Event *event EINA_UNUSED)
 //////////////////////////////////////////////////////////////////////////
 
 static void
-_run_cancel_cb(void *data, Efl_Loop_Consumer *consumer EINA_UNUSED, const Eina_Promise *dead_promise EINA_UNUSED)
+_run_cancel_cb(void *data, const Eina_Promise *dead_promise EINA_UNUSED)
 {
    Eo *obj = data;
    Efl_Thread_Data *pd = efl_data_scope_get(obj, MY_CLASS);
@@ -777,7 +777,7 @@ _efl_thread_efl_task_run(Eo *obj, Efl_Thread_Data *pd)
      }
    pd->thdat = thdat;
    pd->run = EINA_TRUE;
-   pd->promise = efl_loop_promise_new(obj, obj, _run_cancel_cb, NULL);
+   pd->promise = efl_loop_promise_new(obj, _run_cancel_cb, obj);
    return efl_future_then(obj, eina_future_new(pd->promise));
 }
 

diff --git a/src/lib/ecore_con/efl_net_control_access_point-connman.c b/src/lib/ecore_con/efl_net_control_access_point-connman.c
index 32394ab989180ec7ac558db14bd379132b12f567..a54cce2a504f9682bb76462f4497c7b94efe3b39 100644 (file)
--- a/src/lib/ecore_con/efl_net_control_access_point-connman.c
+++ b/src/lib/ecore_con/efl_net_control_access_point-connman.c
@@ -751,7 +751,7 @@ _efl_net_control_access_point_connect_cb(void *data, const Eldbus_Message *msg,
 }
 
 static void
-_efl_net_control_access_point_connect_promise_del(void *data, Efl_Loop_Consumer *consumer EINA_UNUSED, const Eina_Promise *dead_ptr)
+_efl_net_control_access_point_connect_promise_del(void *data, const Eina_Promise *dead_ptr)
 {
    Eldbus_Pending *p = data;
    Efl_Net_Control_Access_Point_Data *pd;
@@ -773,7 +773,7 @@ _efl_net_control_access_point_connect(Eo *o, Efl_Net_Control_Access_Point_Data *
    Eina_Promise *promise;
    Eina_Future *f = NULL;
 
-   promise = efl_loop_promise_new(o, o, _efl_net_control_access_point_connect_promise_del, NULL);
+   promise = efl_loop_promise_new(o, _efl_net_control_access_point_connect_promise_del, o);
    EINA_SAFETY_ON_NULL_RETURN_VAL(promise, NULL);
 
    f = eina_future_new(promise);

diff --git a/src/lib/ecore_con/efl_net_control_technology-connman.c b/src/lib/ecore_con/efl_net_control_technology-connman.c
index a006923e61ee7e90c2da99621411e01fd9f81a9b..92660de83f91ba654af0a59c124d2691d122c4e4 100644 (file)
--- a/src/lib/ecore_con/efl_net_control_technology-connman.c
+++ b/src/lib/ecore_con/efl_net_control_technology-connman.c
@@ -371,9 +371,9 @@ _efl_net_control_technology_scan_cb(void *data, const Eldbus_Message *msg, Eldbu
 }
 
 static void
-_efl_net_control_technology_scan_promise_del(void *data, Efl_Loop_Consumer *consumer, const Eina_Promise *dead_ptr)
+_efl_net_control_technology_scan_promise_del(void *data, const Eina_Promise *dead_ptr)
 {
-   Eldbus_Pending *p = consumer;
+   Eldbus_Pending *p = data;
    Efl_Net_Control_Technology_Data *pd;
    Eo *o;
 
@@ -399,7 +399,7 @@ _efl_net_control_technology_scan(Eo *o, Efl_Net_Control_Technology_Data *pd)
    Eina_Promise *promise;
    Eina_Future *f = NULL;
 
-   promise = efl_loop_promise_new(o, NULL, _efl_net_control_technology_scan_promise_del, NULL);
+   promise = efl_loop_promise_new(o, _efl_net_control_technology_scan_promise_del, NULL);
    EINA_SAFETY_ON_NULL_RETURN_VAL(promise, NULL);
 
    f = eina_future_new(promise);

diff --git a/src/lib/ecore_con/efl_net_ip_address.c b/src/lib/ecore_con/efl_net_ip_address.c
index 46fe75bd08ba973961dbc908516cfc8941c041cd..b6d9317dee366b4650a3cc50216b522cea2621ce 100644 (file)
--- a/src/lib/ecore_con/efl_net_ip_address.c
+++ b/src/lib/ecore_con/efl_net_ip_address.c
@@ -573,7 +573,7 @@ _efl_net_ip_address_resolve(Eo *cls EINA_UNUSED, void *pd EINA_UNUSED, const cha
    ctx->thread = efl_net_ip_resolve_async_new(host, port, &hints, _efl_net_ip_address_resolve_done, ctx);
    EINA_SAFETY_ON_NULL_GOTO(ctx->thread, error_thread);
 
-   ctx->promise = eina_promise_new(efl_loop_future_scheduler_get(efl_main_loop_get()), _efl_net_ip_address_resolve_del, ctx);
+   ctx->promise = efl_loop_promise_new(efl_main_loop_get(), _efl_net_ip_address_resolve_del, ctx);
    EINA_SAFETY_ON_NULL_GOTO(ctx->promise, error_promise);
 
    free(str);

diff --git a/src/lib/eio/efl_io_manager.c b/src/lib/eio/efl_io_manager.c
index 9dcdfeeedf2d93b82d7331c15e4e804d6e2a2a07..6ac1746621790502c0ab4e6cf6e045f3cc89bcc2 100644 (file)
--- a/src/lib/eio/efl_io_manager.c
+++ b/src/lib/eio/efl_io_manager.c
@@ -119,7 +119,7 @@ _efl_io_manager_direct_ls(const Eo *obj,
    Eina_Future *future;
    Eio_File *h;
 
-   p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL);
+   p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
    if (!p) return NULL;
    future = eina_future_new(p);
 
@@ -162,7 +162,7 @@ _efl_io_manager_stat_ls(const Eo *obj,
    Eina_Future *future;
    Eio_File *h;
 
-   p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL);
+   p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
    if (!p) return NULL;
    future = eina_future_new(p);
 
@@ -204,7 +204,7 @@ _efl_io_manager_ls(const Eo *obj,
    Eina_Future *future;
    Eio_File *h;
 
-   p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL);
+   p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
    if (!p) return NULL;
    future = eina_future_new(p);
 
@@ -256,7 +256,7 @@ _efl_io_manager_stat(const Eo *obj,
    Eina_Future *future;
    Eio_File *h;
 
-   p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL);
+   p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
    if (!p) return NULL;
    future = eina_future_new(p);
 
@@ -285,7 +285,7 @@ _efl_io_manager_xattr_ls(const Eo *obj,
    Eina_Future *future;
    Eio_File *h;
 
-   p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL);
+   p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
    if (!p) return NULL;
    future = eina_future_new(p);
 
@@ -336,7 +336,7 @@ _efl_io_manager_xattr_set(Eo *obj,
    Eina_Future *future;
    Eio_File *h;
 
-   p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL);
+   p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
    if (!p) return NULL;
    future = eina_future_new(p);
 
@@ -366,7 +366,7 @@ _efl_io_manager_xattr_get(const Eo *obj,
    Eina_Future *future;
    Eio_File *h;
 
-   p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL);
+   p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
    if (!p) return NULL;
    future = eina_future_new(p);
 
@@ -405,7 +405,7 @@ _efl_io_manager_open(const Eo *obj,
    Eina_Future *future;
    Eio_File *h;
 
-   p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL);
+   p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
    if (!p) return NULL;
    future = eina_future_new(p);
 
@@ -431,7 +431,7 @@ _efl_io_manager_close(const Eo *obj,
    Eina_Future *future;
    Eio_File *h;
 
-   p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL);
+   p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
    if (!p) return NULL;
    future = eina_future_new(p);
 

diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index c6e03e663bff48cbc053986f1c2e61ce1963cebb..309af24a011db9a6959f510b4aa212d629cbde66 100644 (file)
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -417,7 +417,7 @@ _build_delay(Efl_Loop *loop)
 {
    Eina_Promise *p;
 
-   p = eina_promise_new(efl_loop_future_scheduler_get(loop), _cancel_request, NULL);
+   p = efl_loop_promise_new(loop, _cancel_request, NULL);
 
    if (!delayed_queue)
      {
@@ -682,7 +682,7 @@ _eio_model_efl_model_property_set(Eo *obj,
 
    if (finalized)
      {
-        Eina_Promise *p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL);
+        Eina_Promise *p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
         f = eina_future_new(p);
 
         pd->request.move = eio_file_move(pd->path, path,

diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c
index a8f2d524783b0f8c182b7b7da8f73810e46bcc42..175afcd92487ddf6a9743dc83a8632d6f48e896a 100644 (file)
--- a/src/lib/eldbus/eldbus_model_connection.c
+++ b/src/lib/eldbus/eldbus_model_connection.c
@@ -70,7 +70,7 @@ _eldbus_model_connection_efl_model_children_slice_get(Eo *obj,
         return efl_loop_future_resolved(obj, v);
      }
 
-   p = efl_loop_promise_new(obj, NULL, _eldbus_eina_promise_cancel, NULL);
+   p = efl_loop_promise_new(obj, _eldbus_eina_promise_cancel, NULL);
 
    slice = calloc(1, sizeof (Eldbus_Children_Slice_Promise));
    slice->p = p;

diff --git a/src/lib/eldbus/eldbus_model_object.c b/src/lib/eldbus/eldbus_model_object.c
index b975514cbd2a641fbb253b63bc890a706147249e..3759fc3f8fd3c6f79bc8e204d21bd0268d1b527a 100644 (file)
--- a/src/lib/eldbus/eldbus_model_object.c
+++ b/src/lib/eldbus/eldbus_model_object.c
@@ -127,7 +127,7 @@ _eldbus_model_object_efl_model_children_slice_get(Eo *obj EINA_UNUSED,
         return efl_loop_future_resolved(obj, v);
      }
 
-   p = efl_loop_promise_new(obj, NULL, _eldbus_eina_promise_cancel, NULL);
+   p = efl_loop_promise_new(obj, _eldbus_eina_promise_cancel, NULL);
 
    slice = calloc(1, sizeof(struct _Eldbus_Children_Slice_Promise));
    slice->p = p;

diff --git a/src/lib/eldbus/eldbus_model_private.h b/src/lib/eldbus/eldbus_model_private.h
index e58a25d30d8248f34542a388531dcf34766bb5a6..3f6685921b142b6a32a15123beab9deb90974eb0 100644 (file)
--- a/src/lib/eldbus/eldbus_model_private.h
+++ b/src/lib/eldbus/eldbus_model_private.h
@@ -41,7 +41,6 @@ extern int eldbus_model_log_dom;
 
 static inline void
 _eldbus_eina_promise_cancel(void *data EINA_UNUSED,
-                            Efl_Loop_Consumer *consumer EINA_UNUSED,
                             const Eina_Promise *dead_ptr EINA_UNUSED)
 {
 }

diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index ca5cfc3bf2475035965c52643b0ae66cfb9b376a..4da54ad7f4adfdafb17a73df91b64337dfbbd3a3 100644 (file)
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -230,7 +230,6 @@ eldbus_model_proxy_property_check(Eldbus_Model_Proxy_Data *pd,
 
 static void
 _eldbus_model_proxy_cancel_cb(void *data,
-                              Efl_Loop_Consumer *consumer EINA_UNUSED,
                               const Eina_Promise *dead_promise EINA_UNUSED)
 {
    Eldbus_Model_Proxy_Property_Set_Data *sd = data;
@@ -294,7 +293,7 @@ _eldbus_model_proxy_efl_model_property_set(Eo *obj EINA_UNUSED,
    if (!data) goto on_error;
 
    data->pd = pd;
-   data->promise = efl_loop_promise_new(obj, data, _eldbus_model_proxy_cancel_cb, NULL);
+   data->promise = efl_loop_promise_new(obj, _eldbus_model_proxy_cancel_cb, data);
    data->property = eina_stringshare_add(property);
    if (!(data->value = eina_value_dup(value))) goto on_error;
 

diff --git a/src/lib/elementary/efl_selection_manager.c b/src/lib/elementary/efl_selection_manager.c
index f332f717b185c27e1383ab43b900aec025b2d244..3e8014bc8b66813d1cf72e02194549bf20087b07 100644 (file)
--- a/src/lib/elementary/efl_selection_manager.c
+++ b/src/lib/elementary/efl_selection_manager.c
@@ -237,7 +237,7 @@ _sel_manager_seat_selection_init(Efl_Selection_Manager_Data *pd, unsigned int se
 }
 
 static void
-_sel_manager_promise_cancel(void *data, Efl_Loop_Consumer *consumer, const Eina_Promise *dead_future EINA_UNUSED)
+_sel_manager_promise_cancel(void *data, const Eina_Promise *dead_future EINA_UNUSED)
 {
    Sel_Manager_Selection_Lost *sel_lost = data;
    sel_lost->seat_sel->sel_lost_list = eina_list_remove(
@@ -260,7 +260,7 @@ _update_sel_lost_list(Efl_Object *obj, Efl_Selection_Type type,
    sel_lost->seat_sel = seat_sel;
    seat_sel->sel_lost_list = eina_list_append(seat_sel->sel_lost_list, sel_lost);
 
-   p = efl_loop_promise_new(obj, NULL, _sel_manager_promise_cancel, NULL);
+   p = efl_loop_promise_new(obj, _sel_manager_promise_cancel, NULL);
    eina_promise_data_set(p, sel_lost);
    if (!p) return NULL;
    sel_lost->promise = p;

diff --git a/src/lib/eo/eina_types.eot b/src/lib/eo/eina_types.eot
index d0b3dcbcb9260b7c09e0cc4c16b5a4e3ce542ef6..d08382c1cd0ea7774979b7d7ca91c03315df4e7f 100644 (file)
--- a/src/lib/eo/eina_types.eot
+++ b/src/lib/eo/eina_types.eot
@@ -99,8 +99,6 @@ struct @extern Eina.Stat {
     ctimensec: ulong; [[The nano version of the timestmap when the file was created]]
 }
 
-struct @extern Eina.Promise; [[Eina promise type]]
-
 /* FIXME: This definitely shouldn't be here. */
 type Efl.Event_Cb: __undefined_type; [[Efl event callback type]]