kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixup Eina: Add Eina_Promise/Eina_Future 

_eina_promise_clean_dispatch() must call _eina_future_dispatch() since
complex chains will need to be walked -- this bugged me for some
complex tests I'm doing with coroutines.

Unfortunately that will modify the value and cause problems since the
caller trust it wasn't modified and could cause double-free or invalid
memory access. Then we must copy it in _future_proxy().

Other usage for _eina_promise_clean_dispatch() were leaking and are
now "auto fixed".
This commit is contained in:
Gustavo Sverzut Barbieri 2017-08-27 00:27:40 -03:00
parent c35e929713
commit 07f272b52e
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/lib/eina/eina_promise.c
View File

@ -363,7 +363,11 @@ _eina_future_dispatch_internal(Eina_Future **f,
assert(value.type != &EINA_VALUE_TYPE_PROMISE2);
while ((*f) && (!(*f)->cb)) *f = _eina_future_free(*f);
if (!*f) return value;
if (!*f)
{
_eina_promise_value_dbg("No future to deliver value", NULL, value);
return value;
}
next_value = _eina_future_cb_dispatch(*f, value);
*f = _eina_future_free(*f);
return next_value;
@ -576,17 +580,15 @@ eina_promise_as_value(Eina_Promise *p)
}
static void
_eina_promise_clean_dispatch(Eina_Promise *p, const Eina_Value v)
_eina_promise_clean_dispatch(Eina_Promise *p, Eina_Value v)
{
Eina_Value r;
Eina_Future *f = p->future;
if (f)
{
_eina_promise_value_dbg("Clean contenxt - Resolving promise", p, v);
_eina_promise_unlink(p);
r = _eina_future_dispatch_internal(&f, v);
if (!_eina_value_is(v, r)) _eina_value_safe_flush(r);
_eina_future_dispatch(f, v);
}
eina_mempool_free(_promise_mp, p);
}
@ -595,8 +597,16 @@ static Eina_Value
_future_proxy(void *data, const Eina_Value v,
const Eina_Future *dead_future EINA_UNUSED)
{
Eina_Value copy;
//We're in a safe context (from mainloop), so we can avoid scheduling a new dispatch
_eina_promise_clean_dispatch(data, v);
if (!v.type) copy = v;
else if (!eina_value_copy(&v, &copy))
{
ERR("Value cannot be copied - unusable with Eina_Future: %p (%s)", v.type, v.type->name);
eina_value_setup(&copy, EINA_VALUE_TYPE_ERROR);
eina_value_set(&copy, ENOTSUP);
}
_eina_promise_clean_dispatch(data, copy);
return v;
}
@ -1110,6 +1120,7 @@ _all_then_cb(void *data, const Eina_Value v,
{
//We're in a safe context (from mainloop), so we can avoid scheduling a new dispatch
_eina_promise_clean_dispatch(ctx->base.promise, ctx->values);
ctx->values = EINA_VALUE_EMPTY; /* flushed in _eina_promise_clean_dispatch() */
_all_promise2_ctx_free(ctx);
}
return v;