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

eio: rely on efl_future_then to properly protect Eo object during the lifecycle of the future callback. 

Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D8334
This commit is contained in:
Cedric BAIL 2019-03-13 14:50:48 -07:00
parent a947d8e5b1
commit 6b6faef3a3
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/eio/efl_io_model.c
View File

@ -439,10 +439,9 @@ _eio_build_mime_clean(Efl_Io_Model_Data *pd)
}
static Eina_Value
_eio_build_mime_now(void *data, const Eina_Value v, const Eina_Future *dead_future EINA_UNUSED)
_eio_build_mime_now(Eo *model, void *data, const Eina_Value v)
{
Efl_Io_Model *model = data;
Efl_Io_Model_Data *pd = efl_data_scope_get(model, EFL_IO_MODEL_CLASS);
Efl_Io_Model_Data *pd = data;
if (v.type == EINA_VALUE_TYPE_ERROR) goto on_error;
if (!pd->loop) goto on_error;
@ -450,8 +449,9 @@ _eio_build_mime_now(void *data, const Eina_Value v, const Eina_Future *dead_futu
// Make sure that we are not over consuming time in the main loop
if (delayed_queue || ecore_time_get() - ecore_loop_time_get() > 0.004)
{
Eina_Future *f = eina_future_then(_build_delay(model),
_eio_build_mime_now, model, NULL);
Eina_Future *f = efl_future_then(model, _build_delay(model),
.success = _eio_build_mime_now,
.data = pd);
return eina_future_as_value(efl_future_then(model, f));
}
@ -472,16 +472,14 @@ _eio_build_mime_now(void *data, const Eina_Value v, const Eina_Future *dead_futu
static void
_eio_build_mime(const Efl_Object *model, Efl_Io_Model_Data *pd)
{
Eina_Future *f;
if (pd->mime_type) return ;
if (pd->request.mime) return ;
efl_wref_add(efl_loop_get(model), &pd->loop);
f = efl_loop_job(pd->loop);
f = eina_future_then(f, _eio_build_mime_now, model, NULL);
pd->request.mime = efl_future_then(model, f);
pd->request.mime = efl_future_then(model, efl_loop_job(pd->loop),
.success = _eio_build_mime_now,
.data = pd);
}
static Eina_Value *