f = eina_future_then(efl_loop_job(efl_loop_get(data)),
_code_changed, data, NULL);
- efl_future_Eina_FutureXXX_then(data, f);
+ efl_future_then(data, f);
}
static void
pd->run = EINA_TRUE;
pd->promise = efl_loop_promise_new(obj, _run_cancel_cb, obj);
Eina_Future *f = eina_future_new(pd->promise);
- return efl_future_Eina_FutureXXX_then(obj, f);
+ return efl_future_then(obj, f);
}
// this code is in the child here, and is temporary setup until we
// exec() the child to replace everything.
if (pd->inactivity_timer) eina_future_cancel(pd->inactivity_timer);
if (pd->timeout_inactivity <= 0.0) return;
- efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_inactivity),
+ efl_future_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_inactivity),
.success = _efl_io_copier_timeout_inactivity_cb,
.storage = &pd->inactivity_timer);
}
}
else
{
- efl_future_Eina_FutureXXX_then(o, efl_loop_job(efl_loop_get(o)),
+ efl_future_then(o, efl_loop_job(efl_loop_get(o)),
.success = _efl_io_copier_job,
.storage = &pd->job);
}
job = eina_future_then(efl_loop_job(efl_main_loop_get()),
_efl_loop_arguments_send, arga, NULL);
- efl_future_Eina_FutureXXX_then(efl_main_loop_get(), job);
+ efl_future_then(efl_main_loop_get(), job);
}
static Eina_Future *
{
Eina_Future_Scheduler *sched = efl_loop_future_scheduler_get(obj);
// NOTE: Eolian should do efl_future_then() to bind future to object.
- return efl_future_Eina_FutureXXX_then
+ return efl_future_then
(obj, eina_future_resolved(sched, EINA_VALUE_EMPTY));
}
d->promise = p;
// NOTE: Eolian should do efl_future_then() to bind future to object.
- return efl_future_Eina_FutureXXX_then(obj, eina_future_new(p));
+ return efl_future_then(obj, eina_future_new(p));
idler_error:
d->idler = NULL;
d->promise = p;
// NOTE: Eolian should do efl_future_then() to bind future to object.
- return efl_future_Eina_FutureXXX_then(obj, eina_future_new(p));
+ return efl_future_then(obj, eina_future_new(p));
timer_error:
d->timer = NULL;
req->parent = efl_ref(obj);
req->start = start;
- return efl_future_Eina_FutureXXX_then
+ return efl_future_then
(obj, eina_future_then(f, _efl_model_composite_boolean_then, req, NULL));
}
if (!success)
return eina_future_rejected(efl_loop_future_scheduler_get(obj), EFL_MODEL_ERROR_INCORRECT_VALUE);
- return efl_future_Eina_FutureXXX_then
+ return efl_future_then
(obj, eina_future_then(efl_model_children_slice_get(obj, l, 1),
_select_slice_then, obj, NULL));
}
commit_change:
chain = eina_future_then(chain, _commit_change, obj, NULL);
- return efl_future_Eina_FutureXXX_then(obj, chain);
+ return efl_future_then(obj, chain);
}
typedef struct _Selection_Children_Request Selection_Children_Request;
start, count);
f = eina_future_then(f, _slice_get, req, NULL);
- return efl_future_Eina_FutureXXX_then(obj, f);
+ return efl_future_then(obj, f);
}
#include "efl_model_composite_selection.eo.c"
f = eina_future_resolved(efl_loop_future_scheduler_get(obj),
eina_value_reference_copy(value));
eina_value_free(value);
- return efl_future_Eina_FutureXXX_then(obj, f);
+ return efl_future_then(obj, f);
}
#include "efl_model_loop.eo.c"
for (i = 0; i < thdat->args.argc; i++)
efl_task_arg_append(obj, thdat->args.argv[i]);
job = eina_future_then(efl_loop_job(obj), _efl_loop_arguments_send, obj);
- efl_future_Eina_FutureXXX_then(obj, job);
+ efl_future_then(obj, job);
for (i = 0; i < thdat->args.argc; i++)
eina_stringshare_del(thdat->args.argv[i]);
pd->run = EINA_TRUE;
pd->promise = efl_loop_promise_new(obj, _run_cancel_cb, obj);
Eina_Future *f = eina_future_new(pd->promise);
- return efl_future_Eina_FutureXXX_then(obj, f);
+ return efl_future_then(obj, f);
}
EOLIAN static void
pd->pending = eina_list_append(pd->pending, p);
eldbus_pending_data_set(p, ".object", pd);
- return efl_future_Eina_FutureXXX_then(o, f);
+ return efl_future_then(o, f);
error_dbus:
eina_promise_reject(promise, ENOSYS);
- return efl_future_Eina_FutureXXX_then(o, f);
+ return efl_future_then(o, f);
}
static void
eina_promise_data_set(promise, p);
eldbus_pending_data_set(p, ".object", o);
- return efl_future_Eina_FutureXXX_then(o, f);
+ return efl_future_then(o, f);
error_dbus:
eina_promise_reject(promise, ENOSYS);
- return efl_future_Eina_FutureXXX_then(o, f);
+ return efl_future_then(o, f);
}
const char *
{
if ((!pd->pending_close) && (pd->easy))
{
- efl_future_Eina_FutureXXX_then(o, efl_loop_job(efl_loop_get(o)),
+ efl_future_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);
static void
_timeout_schedule(Eo *o, Efl_Net_Dialer_Ssl_Data *pd, double timeout)
{
- efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), timeout),
+ efl_future_then(o, efl_loop_timeout(efl_loop_get(o), timeout),
.success = _efl_net_dialer_ssl_connect_timeout,
.storage = &pd->connect_timeout);
}
static void
_timeout_schedule(Eo *o, Efl_Net_Dialer_Tcp_Data *pd)
{
- efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
+ efl_future_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
.success = _efl_net_dialer_tcp_connect_timeout,
.storage = &pd->connect.timeout);
}
static void
_timeout_schedule(Eo *o, Efl_Net_Dialer_Udp_Data *pd)
{
- efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
+ efl_future_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
.success = _efl_net_dialer_udp_resolver_timeout,
.storage = &pd->resolver.timeout);
}
static void
_timeout_schedule(Eo *o, Efl_Net_Dialer_Unix_Data *pd)
{
- efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
+ efl_future_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
.success = _efl_net_dialer_unix_connect_timeout,
.storage = &pd->connect.timeout);
}
loop = efl_loop_get(o);
if (!loop) return;
- efl_future_Eina_FutureXXX_then(o, efl_loop_job(loop),
+ efl_future_then(o, efl_loop_job(loop),
.success = _efl_net_dialer_websocket_job,
.storage = &pd->job);
}
if (pd->close_timeout)
eina_future_cancel(pd->close_timeout);
- efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), 2.0),
+ efl_future_then(o, efl_loop_timeout(efl_loop_get(o), 2.0),
.success = _efl_net_dialer_websocket_close_request_timeout,
.storage = &pd->close_timeout);
loop = efl_loop_get(o);
if (!loop) return;
- efl_future_Eina_FutureXXX_then(o, efl_loop_job(loop),
+ efl_future_then(o, efl_loop_job(loop),
.success = _efl_net_server_windows_pending_announce_job,
.storage = &pd->pending_announcer_job);
}
ecore_thread_local_data_add(h->thread, ".info_data", info_data, info_free_cb, EINA_TRUE);
eina_promise_data_set(p, h);
- return efl_future_Eina_FutureXXX_then(obj, future);
+ return efl_future_then(obj, future);
end:
return future;
ecore_thread_local_data_add(h->thread, ".info_data", info_data, info_free_cb, EINA_TRUE);
eina_promise_data_set(p, h);
- return efl_future_Eina_FutureXXX_then(obj, future);
+ return efl_future_then(obj, future);
end:
return future;
ecore_thread_local_data_add(h->thread, ".paths_data", paths_data, paths_free_cb, EINA_TRUE);
eina_promise_data_set(p, h);
- return efl_future_Eina_FutureXXX_then(obj, future);
+ return efl_future_then(obj, future);
end:
return future;
if (!h) goto end;
eina_promise_data_set(p, h);
- return efl_future_Eina_FutureXXX_then(obj, future);
+ return efl_future_then(obj, future);
end:
return future;
ecore_thread_local_data_add(h->thread, ".paths_data", paths_data, paths_free_cb, EINA_TRUE);
eina_promise_data_set(p, h);
- return efl_future_Eina_FutureXXX_then(obj, future);
+ return efl_future_then(obj, future);
end:
- return efl_future_Eina_FutureXXX_then(obj, future);;
+ return efl_future_then(obj, future);;
}
static void
if (!h) goto end;
eina_promise_data_set(p, h);
- return efl_future_Eina_FutureXXX_then(obj, future);
+ return efl_future_then(obj, future);
end:
return future;
eina_promise_data_set(p, h);
/* XXX const */
- return efl_future_Eina_FutureXXX_then((Eo *)obj, future);
+ return efl_future_then((Eo *)obj, future);
end:
return future;
if (!h) goto end;
eina_promise_data_set(p, h);
- return efl_future_Eina_FutureXXX_then(obj, future);
+ return efl_future_then(obj, future);
end:
return future;
if (!h) goto end;
eina_promise_data_set(p, h);
- return efl_future_Eina_FutureXXX_then(obj, future);
+ return efl_future_then(obj, future);
end:
return future;
{
Eina_Future *f = eina_future_then(_build_delay(pd->loop),
_eio_build_mime_now, model, NULL);
- return eina_future_as_value(efl_future_Eina_FutureXXX_then(model, f));
+ return eina_future_as_value(efl_future_then(model, f));
}
pd->mime_type = efreet_mime_type_get(pd->path);
f = efl_loop_job(pd->loop);
f = eina_future_then(f, _eio_build_mime_now, model, NULL);
- pd->request.mime = efl_future_Eina_FutureXXX_then(model, f);
+ pd->request.mime = efl_future_then(model, f);
}
static Eina_Value *
eina_value_string_init(pd->path));
}
- return efl_future_Eina_FutureXXX_then(obj, f);
+ return efl_future_then(obj, f);
on_error:
return eina_future_rejected(efl_loop_future_scheduler_get(loop), err);
f = efl_io_manager_direct_ls(iom, pd->path, EINA_FALSE,
(void*) obj, _eio_model_children_list, NULL);
f = eina_future_then(f, _eio_model_children_list_on, pd, NULL);
- pd->request.listing = efl_future_Eina_FutureXXX_then(obj, f);
+ pd->request.listing = efl_future_then(obj, f);
}
return eina_list_count(pd->files);
pd->requests = eina_list_prepend(pd->requests, slice);
_eldbus_model_children_list(obj, pd);
- return efl_future_Eina_FutureXXX_then(obj, eina_future_new(p));;
+ return efl_future_then(obj, eina_future_new(p));;
}
static unsigned int
if (!pd->pendings)
_eldbus_model_object_introspect(obj, pd, pd->bus, pd->path);
- return efl_future_Eina_FutureXXX_then(obj, eina_future_new(p));;
+ return efl_future_then(obj, eina_future_new(p));;
}
static unsigned int
}
if (pending) pd->pendings = eina_list_append(pd->pendings, pending);
- return efl_future_Eina_FutureXXX_then(obj, eina_future_new(data->promise));
+ return efl_future_then(obj, eina_future_new(data->promise));
on_error:
return eina_future_rejected(efl_loop_future_scheduler_get(obj), err);
{
Eina_Future *f = efl_model_children_slice_get(pd->model, first, count);
f = eina_future_then(f, _children_slice_then, pd, NULL);
- pd->slice.future = efl_future_Eina_FutureXXX_then(obj, f);
+ pd->slice.future = efl_future_then(obj, f);
}
}
f = eina_future_then(efl_loop_job(efl_loop_get(sd->obj)),
_scroll_wheel_post_event_job, sd, NULL);
- efl_future_Eina_FutureXXX_then(sd->obj, f);
+ efl_future_then(sd->obj, f);
}
else
{
{
future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model));
future = eina_future_then(future, _process_children_cb, lreq, NULL);
- efl_future_Eina_FutureXXX_then(obj, future);
+ efl_future_then(obj, future);
}
else
{
f = efl_model_children_slice_get(sd->model, evt->index, 1);
f = eina_future_then(f, _resource_created_then, fs, NULL);
- efl_future_Eina_FutureXXX_then(fs, f);
+ efl_future_then(fs, f);
}
static void
f = eina_future_then(efl_loop_job(efl_loop_get(sid->obj)),
_scroll_wheel_post_event_job, sid, NULL);
- efl_future_Eina_FutureXXX_then(sid->obj, f);
+ efl_future_then(sid->obj, f);
}
else
{
f = efl_model_children_slice_get(pdata->priv->connect.model, 0,
efl_model_children_count_get(pdata->priv->connect.model));
f = eina_future_then(f, _efl_model_load_children_then, pdata, NULL);
- efl_future_Eina_FutureXXX_then(pdata->priv->genlist, f);
+ efl_future_then(pdata->priv->genlist, f);
}
static void
f = efl_model_children_slice_get(idata->priv->connect.model, evt->index, 1);
f = eina_future_then(f, _efl_model_load_children_then, idata, NULL);
- efl_future_Eina_FutureXXX_then(idata->priv->genlist, f);
+ efl_future_then(idata->priv->genlist, f);
}
static void
* @endcode
*
* @see efl_future_cb_from_desc()
- * @see efl_future_Eina_FutureXXX_then()
+ * @see efl_future_then()
*/
#define efl_future_cb(_eo, ...) efl_future_cb_from_desc(_eo, (Efl_Future_Cb_Desc){__VA_ARGS__})
*
* Usage:
* @code
- * efl_future_Eina_FutureXXX_then(o, future, .success = success, .success_type = EINA_VALUE_TYPE_INT);
+ * efl_future_then(o, future, .success = success, .success_type = EINA_VALUE_TYPE_INT);
* @endcode
*
*/
-#define efl_future_Eina_FutureXXX_then(_eo, _future, ...) eina_future_then_from_desc(_future, efl_future_cb(_eo, ## __VA_ARGS__))
+#define efl_future_then(_eo, _future, ...) eina_future_then_from_desc(_future, efl_future_cb(_eo, ## __VA_ARGS__))
/**
* Creates a Future chain based on #Efl_Future_Cb_Desc