From: Cedric BAIL <cedric@osg.samsung.com>
Date: Thu, 20 Dec 2018 00:25:38 +0000 (-0800)
Subject: eina: add a function to free Eina_Promise attached data when the promise is destroyed.
X-Git-Tag: submit/tizen/20181227.084356~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4375e6d396aca0b5de19edc5d2a1229c4d5fba25;p=platform%2Fupstream%2Fefl.git

eina: add a function to free Eina_Promise attached data when the promise is destroyed.

Reviewed-by: Lauro Neto <Lauro Moura <lauromoura@expertisesolutions.com.br>>
Differential Revision: https://phab.enlightenment.org/D7491
---

diff --git a/src/lib/eina/eina_promise.c b/src/lib/eina/eina_promise.c
index 222f7d5..c239ba6 100644
--- a/src/lib/eina/eina_promise.c
+++ b/src/lib/eina/eina_promise.c
@@ -103,6 +103,7 @@ struct _Eina_Promise {
    Eina_Future *future;
    Eina_Future_Scheduler *scheduler;
    Eina_Promise_Cancel_Cb cancel;
+   Eina_Free_Cb free_cb;
    const void *data;
 };
 
@@ -306,12 +307,19 @@ _eina_promise_link(Eina_Promise *p, Eina_Future *f)
 }
 
 static void
+_eina_promise_free(Eina_Promise *p)
+{
+   if (p->free_cb) p->free_cb((void*) p->data);
+   eina_mempool_free(_promise_mp, p);
+}
+
+static void
 _eina_promise_cancel(Eina_Promise *p)
 {
    DBG("Cancelling promise: %p, data: %p, future: %p", p, p->data, p->future);
    _eina_promise_unlink(p);
    p->cancel((void *)p->data, p);
-   eina_mempool_free(_promise_mp, p);
+   _eina_promise_free(p);
 }
 
 static void
@@ -516,7 +524,7 @@ _eina_promise_deliver(Eina_Promise *p,
         DBG("Promise %p has no future", p);
         eina_value_flush(&value);
      }
-   eina_mempool_free(_promise_mp, p);
+   _eina_promise_free(p);
 }
 
 Eina_Bool
@@ -635,7 +643,7 @@ _eina_promise_clean_dispatch(Eina_Promise *p, Eina_Value v)
         // This function is called on a promise created with a scheduler, not a continue one.
         _eina_future_dispatch(p->scheduler, f, v);
      }
-   eina_mempool_free(_promise_mp, p);
+   _eina_promise_free(p);
 }
 
 static Eina_Value
@@ -1111,6 +1119,13 @@ eina_promise_data_set(Eina_Promise *p,
    p->data = data;
 }
 
+EAPI void
+eina_promise_data_free_cb_set(Eina_Promise *p,
+                              Eina_Free_Cb free_cb)
+{
+   EINA_SAFETY_ON_NULL_RETURN(p);
+   p->free_cb = free_cb;
+}
 
 static Eina_Value
 _eina_future_cb_easy(void *data, const Eina_Value value,
diff --git a/src/lib/eina/eina_promise.h b/src/lib/eina/eina_promise.h
index 14e550d..1896260 100644
--- a/src/lib/eina/eina_promise.h
+++ b/src/lib/eina/eina_promise.h
@@ -629,6 +629,14 @@ EAPI void *eina_promise_data_get(const Eina_Promise *p) EINA_ARG_NONNULL(1);
 EAPI void eina_promise_data_set(Eina_Promise *p, void *data) EINA_ARG_NONNULL(1);
 
 /**
+ * Sets the free callback used when the data attached on the promise is freed just before the destruction of the promise itself.
+ *
+ * @param[in] p The promise to set the free callback on.
+ * @param[in] free_cb The free callback.
+ */
+EAPI void eina_promise_data_free_cb_set(Eina_Promise *p, Eina_Free_Cb free_cb);
+
+/**
  * Resolves a promise.
  *
  * This function schedules a resolve event in a