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

ecore: rename efl_loop_Eina_FutureXXX_job to efl_loop_job.

This commit is contained in:
Cedric BAIL 2017-12-11 13:51:52 -08:00
parent d95a0a1377
commit d614894d04
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/elementary/test_gfx_filters.c
View File

@ -237,7 +237,7 @@ _code_changed_hack(void *data, const Efl_Event *ev EINA_UNUSED)
{
Eina_Future *f;
f = eina_future_then(efl_loop_Eina_FutureXXX_job(efl_loop_get(data)),
f = eina_future_then(efl_loop_job(efl_loop_get(data)),
_code_changed, data);
efl_future_Eina_FutureXXX_then(data, f);
}

4
src/lib/ecore/ecore_main.c
View File

@ -3140,7 +3140,7 @@ ecore_loop_arguments_send(int argc, const char **argv)
for (i = 0; i < argc; i++)
eina_array_push(arga, eina_stringshare_add(argv[i]));
job = eina_future_then(efl_loop_Eina_FutureXXX_job(ecore_main_loop_get()),
job = eina_future_then(efl_loop_job(ecore_main_loop_get()),
_efl_loop_arguments_send, arga);
efl_future_Eina_FutureXXX_then(ecore_main_loop_get(), job);
}
@ -3171,7 +3171,7 @@ ecore_loop_promise_unregister(Efl_Loop *l EINA_UNUSED, Efl_Promise *p)
}
static Eina_Future *
_efl_loop_Eina_FutureXXX_job(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED)
_efl_loop_job(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED)
{
// NOTE: Eolian should do efl_future_then() to bind future to object.
return efl_future_Eina_FutureXXX_then(obj,

2
src/lib/ecore/efl_io_copier.c
View File

@ -133,7 +133,7 @@ _efl_io_copier_job_schedule(Eo *o, Efl_Io_Copier_Data *pd)
{
if (pd->job) return;
efl_future_Eina_FutureXXX_then(o, efl_loop_Eina_FutureXXX_job(efl_loop_get(o)),
efl_future_Eina_FutureXXX_then(o, efl_loop_job(efl_loop_get(o)),
.success = _efl_io_copier_job,
.storage = &pd->job);
}

4
src/lib/ecore/efl_loop.eo
View File

@ -70,7 +70,7 @@ class Efl.Loop (Efl.Object)
@in exit_code: any_value; [[Returned value by begin()]]
}
}
Eina_FutureXXX_job {
job {
[[A future promise that will be resolved from a clean main
loop context as soon as possible.
@ -83,7 +83,7 @@ class Efl.Loop (Efl.Object)
[[A future promise that will be resolved from a clean main
loop context as soon as the main loop is idle.
This is a low priority version of @.Eina_FutureXXX_job
This is a low priority version of @.job
]]
return: ptr(Eina.Future) @owned /* TODO: future<void> */; [[The future handle.]]
}

4
src/lib/ecore_con/ecore_con_legacy.c
View File

@ -873,7 +873,7 @@ static void
_ecore_con_server_job_schedule(Ecore_Con_Server *svr, Eo *loop,
Eina_Future_Cb cb)
{
eina_future_then(efl_loop_Eina_FutureXXX_job(loop), cb, svr, &svr->ssl.job);
eina_future_then(efl_loop_job(loop), cb, svr, &svr->ssl.job);
}
EAPI Eina_Bool
@ -918,7 +918,7 @@ ecore_con_ssl_client_upgrade(Ecore_Con_Client *cl, Ecore_Con_Type compl_type)
cl->ssl.upgrading = EINA_TRUE;
cl->ssl.ctx = ssl_ctx;
eina_future_then(efl_loop_Eina_FutureXXX_job(efl_loop_get(cl->socket)),
eina_future_then(efl_loop_job(efl_loop_get(cl->socket)),
_ecore_con_client_ssl_upgrade_job, cl, &cl->ssl.job);
DBG("cl=%p SSL upgrading from %#x to type=%#x", cl, svr->type, compl_type);

4
src/lib/ecore_con/efl_net_dialer_http.c
View File

@ -862,7 +862,7 @@ _efl_net_dialer_http_curl_safe_end(Eo *o, Efl_Net_Dialer_Http_Data *pd, CURL *ea
/* object deleted from CURL callback, CURL* easy was
* dissociated and we must delete it ourselves.
*/
f = efl_loop_Eina_FutureXXX_job(ecore_main_loop_get());
f = efl_loop_job(ecore_main_loop_get());
eina_future_then_from_desc(f, eina_future_cb_easy(.success = _efl_net_dialer_http_curl_cleanup,
.error = _efl_net_dialer_http_curl_cleanup_error,
.data = easy));
@ -1725,7 +1725,7 @@ _efl_net_dialer_http_efl_io_closer_close(Eo *o, Efl_Net_Dialer_Http_Data *pd)
{
if ((!pd->pending_close) && (pd->easy))
{
efl_future_Eina_FutureXXX_then(o, efl_loop_Eina_FutureXXX_job(efl_loop_get(o)),
efl_future_Eina_FutureXXX_then(o, efl_loop_job(efl_loop_get(o)),
.success = _efl_net_dialer_http_pending_close,
.storage = &pd->pending_close);
DBG("dialer=%p closed from CURL callback, schedule close job=%p", o, pd->pending_close);

2
src/lib/ecore_con/efl_net_dialer_websocket.c
View File

@ -764,7 +764,7 @@ _efl_net_dialer_websocket_job_schedule(Eo *o, Efl_Net_Dialer_Websocket_Data *pd)
loop = efl_loop_get(o);
if (!loop) return;
efl_future_Eina_FutureXXX_then(o, efl_loop_Eina_FutureXXX_job(loop),
efl_future_Eina_FutureXXX_then(o, efl_loop_job(loop),
.success = _efl_net_dialer_websocket_job,
.storage = &pd->job);
}

2
src/lib/ecore_con/efl_net_server_windows.c
View File

@ -336,7 +336,7 @@ _efl_net_server_windows_pending_announce_job_schedule(Eo *o, Efl_Net_Server_Wind
loop = efl_loop_get(o);
if (!loop) return;
efl_future_Eina_FutureXXX_then(o, efl_loop_Eina_FutureXXX_job(loop),
efl_future_Eina_FutureXXX_then(o, efl_loop_job(loop),
.success = _efl_net_server_windows_pending_announce_job,
.storage = &pd->pending_announcer_job);
}

2
src/lib/elementary/elm_interface_scrollable.c
View File

@ -1910,7 +1910,7 @@ _scroll_wheel_post_event_go(Elm_Scrollable_Smart_Interface_Data *sid, int x, int
{
Eina_Future *f;
f = eina_future_then(efl_loop_Eina_FutureXXX_job(efl_loop_get(sid->obj)),
f = eina_future_then(efl_loop_job(efl_loop_get(sid->obj)),
_scroll_wheel_post_event_job, sid);
efl_future_Eina_FutureXXX_then(sid->obj, f);
}

2
src/tests/ecore/ecore_test_promise2.c
View File

@ -506,7 +506,7 @@ START_TEST(efl_test_job)
Eina_Bool done = EINA_FALSE;
fail_if(!ecore_init());
f = eina_future_then(efl_loop_Eina_FutureXXX_job(ecore_main_loop_get()),
f = eina_future_then(efl_loop_job(ecore_main_loop_get()),
_promise_empty_done, &done);
fail_if(!f);
ecore_main_loop_begin();