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

eina: Remove Eina_Promise* parameter in promise callback 

Remove not very useful parameter to eina_promise_then callbacks.
This commit is contained in:
Felipe Magno de Almeida 2016-06-03 18:15:57 -03:00
parent 09446ccb90
commit e79eb53e8d
12 changed files with 40 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2839,8 +2839,7 @@ _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED)
}
static void
_efl_loop_args_job_cb(void *data, void *value EINA_UNUSED,
Eina_Promise *promise EINA_UNUSED)
_efl_loop_args_job_cb(void *data, void *value EINA_UNUSED)
{
Efl_Loop_Args *args = data;
Eo *obj = eo_parent_get(args);

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

@ -47,7 +47,7 @@ static void _ecore_promise_ref_update(_Ecore_Thread_Promise_Owner* p)
}
}
static void _ecore_promise_thread_release_ref(void* data, void* value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
static void _ecore_promise_thread_release_ref(void* data, void* value EINA_UNUSED)
{
_Ecore_Thread_Promise_Owner* p = data;
p->ref_count -= p->then_count;

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

@ -169,7 +169,7 @@ _eina_promise_then_calls(_Eina_Promise_Default_Owner* promise)
if (error)
{
if (callback->error_cb)
(*callback->error_cb)(callback->data, promise->promise.error, &promise->promise.vtable);
(*callback->error_cb)(callback->data, promise->promise.error);
}
else if (callback->callback)
{
@ -177,10 +177,10 @@ _eina_promise_then_calls(_Eina_Promise_Default_Owner* promise)
{
char* buffer = promise->value;
void** p = (void**)buffer;
(*callback->callback)(callback->data, *p, &promise->promise.vtable);
(*callback->callback)(callback->data, *p);
}
else
(*callback->callback)(callback->data, &promise->value[0], &promise->promise.vtable);
(*callback->callback)(callback->data, &promise->value[0]);
}
free(callback);
_eina_promise_unref(&promise->promise);

4
src/lib/eina/eina_promise.h
View File

@ -29,12 +29,12 @@ typedef void(*Eina_Promise_Progress_Notify_Cb)(void* data, Eina_Promise_Owner* p
/*
* @brief Function callback type for when using eina_promise_then
*/
typedef void(*Eina_Promise_Cb)(void* data, void* value, Eina_Promise* promise);
typedef void(*Eina_Promise_Cb)(void* data, void* value);
/*
* @brief Function callback type for when using eina_promise_then
*/
typedef void(*Eina_Promise_Error_Cb)(void* data, Eina_Error error, Eina_Promise* promise);
typedef void(*Eina_Promise_Error_Cb)(void* data, Eina_Error error);
/*
* @brief Function callback type for progress information

8
src/lib/elementary/elm_view_form.c
View File

@ -46,7 +46,7 @@ struct _Elm_View_Form_Promise
static void
_efl_promise_then_widget(void* data, void* v, Eina_Promise* promise EINA_UNUSED)
_efl_promise_then_widget(void* data, void* v)
{
Elm_View_Form_Widget *w = data;
Eina_Value *value = v;
@ -54,12 +54,12 @@ _efl_promise_then_widget(void* data, void* v, Eina_Promise* promise EINA_UNUSED)
}
static void
_efl_promise_error_widget(void *data EINA_UNUSED, Eina_Error err EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
_efl_promise_error_widget(void *data EINA_UNUSED, Eina_Error err EINA_UNUSED)
{
}
static void
_efl_model_promise_then_cb(void* data, void* v, Eina_Promise* promise EINA_UNUSED)
_efl_model_promise_then_cb(void* data, void* v)
{
Elm_View_Form_Promise *p = data;
Eina_Value *value = v;
@ -82,7 +82,7 @@ _efl_model_promise_then_cb(void* data, void* v, Eina_Promise* promise EINA_UNUSE
}
static void
_efl_model_promise_error_cb(void* data, Eina_Error error EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
_efl_model_promise_error_cb(void* data, Eina_Error error EINA_UNUSED)
{
Elm_View_Form_Promise *p = data;
EINA_SAFETY_ON_NULL_RETURN(p);

6
src/lib/elementary/elm_view_list.c
View File

@ -93,7 +93,7 @@ _item_del(void *data, Evas_Object *obj EINA_UNUSED)
}
static void
_property_get_cb(void* data, void* v, Eina_Promise* promise EINA_UNUSED)
_property_get_cb(void* data, void* v)
{
View_List_ValueItem *vitem = data;
Eina_Value *value = v;
@ -105,7 +105,7 @@ _property_get_cb(void* data, void* v, Eina_Promise* promise EINA_UNUSED)
}
static void
_property_get_error_cb(void* data, Eina_Error err EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
_property_get_error_cb(void* data, Eina_Error err EINA_UNUSED)
{
View_List_ValueItem *vitem = data;
eina_stringshare_del(vitem->part);
@ -305,7 +305,7 @@ _efl_model_properties_change_cb(void *data, const Eo_Event *event)
}
static void
_efl_model_load_children_then(void * data, void* value, Eina_Promise* promise EINA_UNUSED)
_efl_model_load_children_then(void * data, void* value)
{
View_List_ItemData *pdata = data;
Eina_Accessor *accessor = value;

26
src/tests/ecore/ecore_test_promise.c
View File

@ -11,7 +11,7 @@ void promised_thread(const void* data EINA_UNUSED, Eina_Promise_Owner* promise,
eina_promise_owner_value_set(promise, NULL, NULL);
}
void promise_callback(void* data EINA_UNUSED, void* value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
void promise_callback(void* data EINA_UNUSED, void* value EINA_UNUSED)
{
ecore_main_loop_quit();
}
@ -36,7 +36,7 @@ void promise_error_thread(const void* data EINA_UNUSED, Eina_Promise_Owner* prom
eina_promise_owner_error_set(promise, EINA_ERROR_OUT_OF_MEMORY);
}
void promise_error_callback(void* data EINA_UNUSED, Eina_Error error, Eina_Promise* promise EINA_UNUSED)
void promise_error_callback(void* data EINA_UNUSED, Eina_Error error)
{
ck_assert(error == EINA_ERROR_OUT_OF_MEMORY);
ecore_main_loop_quit();
@ -74,7 +74,7 @@ START_TEST(ecore_test_promise_all)
}
END_TEST
void promise_callback2(void* data, void* value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
void promise_callback2(void* data, void* value EINA_UNUSED)
{
if(++(*(int*)data) == 2)
ecore_main_loop_quit();
@ -186,22 +186,8 @@ START_TEST(ecore_test_promise_then_after_thread_finished_all)
}
END_TEST
/* void promised_block_thread(const void* data EINA_UNUSED, Eina_Promise_Owner* promise, Ecore_Thread* thread EINA_UNUSED) */
/* { */
/* struct timespec v = {.tv_sec = 1, .tv_nsec = 0}, rem; */
/* if(nanosleep(&v, &rem) == -1 && errno == EINTR) */
/* do */
/* { */
/* v = rem; */
/* } */
/* while(nanosleep(&v, &rem) == -1 && errno == EINTR); */
/* int r = 10; */
/* eina_promise_owner_value_set(promise, &r, NULL); */
/* } */
static void
_ecore_test_promise_normal_lifetime_cb(void* data EINA_UNUSED, void* value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
_ecore_test_promise_normal_lifetime_cb(void* data EINA_UNUSED, void* value EINA_UNUSED)
{
ecore_main_loop_quit();
}
@ -254,7 +240,7 @@ START_TEST(ecore_test_promise_normal_lifetime_all)
END_TEST
static void
_ecore_test_promise_immediate_set_lifetime_cb(void* data EINA_UNUSED, void* value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
_ecore_test_promise_immediate_set_lifetime_cb(void* data EINA_UNUSED, void* value EINA_UNUSED)
{
ecore_main_loop_quit();
}
@ -327,7 +313,7 @@ static void _cancel_callback(const void* data, Eina_Promise_Owner* promise EINA_
eina_lock_release(&v->lock);
}
static void _cancel_promise_callback(void* data EINA_UNUSED, Eina_Error value, Eina_Promise* promise EINA_UNUSED)
static void _cancel_promise_callback(void* data EINA_UNUSED, Eina_Error value)
{
ck_assert(value == EINA_ERROR_PROMISE_CANCEL);
ecore_main_loop_quit();

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

@ -176,7 +176,7 @@ START_TEST(ecore_test_timers)
END_TEST
static void
_ecore_promise_quit(void *data, void *value, Eina_Promise* promise EINA_UNUSED)
_ecore_promise_quit(void *data, void *value)
{
Eina_Bool *bob = data;
double *start = value;

8
src/tests/eio/eio_model_test_file.c
View File

@ -58,7 +58,7 @@ static Eina_Bool
}
static void
promise_then_count(void *data EINA_UNUSED, void *p, Eina_Promise* promise EINA_UNUSED)
promise_then_count(void *data EINA_UNUSED, void *p)
{
int *total = p;
ck_assert_ptr_ne(total, NULL);
@ -67,7 +67,7 @@ promise_then_count(void *data EINA_UNUSED, void *p, Eina_Promise* promise EINA_U
}
static void
promise_then_accessor(void *data EINA_UNUSED, void* p, Eina_Promise* promise EINA_UNUSED)
promise_then_accessor(void *data EINA_UNUSED, void* p)
{
Eina_Accessor **accessor = (Eina_Accessor**)p;
ck_assert_ptr_ne(accessor, NULL);
@ -84,7 +84,7 @@ promise_then_accessor(void *data EINA_UNUSED, void* p, Eina_Promise* promise EIN
}
static void
promise_then_value(void *user EINA_UNUSED, void *p, Eina_Promise* promise EINA_UNUSED)
promise_then_value(void *user EINA_UNUSED, void *p)
{
Eina_Value* value = p;
ck_assert_ptr_ne(value, NULL);
@ -98,7 +98,7 @@ promise_then_value(void *user EINA_UNUSED, void *p, Eina_Promise* promise EINA_U
}
static void
error_promise_then(void* data EINA_UNUSED, Eina_Error error EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
error_promise_then(void* data EINA_UNUSED, Eina_Error error EINA_UNUSED)
{
ck_abort_msg(0, "Error Promise cb");
ecore_main_loop_quit();

4
src/tests/eio/eio_model_test_monitor_add.c
View File

@ -64,7 +64,7 @@ _children_added_cb(void *data EINA_UNUSED, const Eo_Event* event)
}
static void
_create_file(void *data EINA_UNUSED, void* value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
_create_file(void *data EINA_UNUSED, void* value EINA_UNUSED)
{
int fd;
if((fd = eina_file_mkstemp("prefixXXXXXX.ext", &temp_filename)) > 0)
@ -76,7 +76,7 @@ _create_file(void *data EINA_UNUSED, void* value EINA_UNUSED, Eina_Promise* prom
static void
_create_file_error(void *data EINA_UNUSED, Eina_Error value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
_create_file_error(void *data EINA_UNUSED, Eina_Error value EINA_UNUSED)
{
ck_abort_msg(0, "Error Promise cb called in Create file");
ecore_main_loop_quit();

14
src/tests/eio/eio_test_job.c
View File

@ -31,7 +31,7 @@ _filter_direct_cb(void *data EINA_UNUSED, const Eo_Event *event)
}
static void
_main_direct_cb(void *data, const Eina_File_Direct_Info *info, Eina_Promise* promise EINA_UNUSED)
_main_direct_cb(void *data, const Eina_File_Direct_Info *info)
{
int *number_of_listed_files = (int *)data;
@ -53,7 +53,7 @@ _filter_cb(void *data EINA_UNUSED, const Eo_Event *event)
}
static void
_main_cb(void *data, const char *file, Eina_Promise* promise EINA_UNUSED)
_main_cb(void *data, const char *file)
{
int *number_of_listed_files = (int *)data;
@ -62,7 +62,7 @@ _main_cb(void *data, const char *file, Eina_Promise* promise EINA_UNUSED)
}
static void
_done_cb(void *data, void* value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
_done_cb(void *data, void* value EINA_UNUSED)
{
int *number_of_listed_files = (int *)data;
fail_if((*number_of_listed_files) != test_count);
@ -71,7 +71,7 @@ _done_cb(void *data, void* value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
}
static void
_error_cb(void *data EINA_UNUSED, Eina_Error error, Eina_Promise* promise EINA_UNUSED)
_error_cb(void *data EINA_UNUSED, Eina_Error error)
{
const char *msg = eina_error_msg_get(error);
EINA_LOG_ERR("error: %s", msg);
@ -79,7 +79,7 @@ _error_cb(void *data EINA_UNUSED, Eina_Error error, Eina_Promise* promise EINA_U
}
static void
_open_done_cb(void *data, void *file_value, Eina_Promise* promise EINA_UNUSED)
_open_done_cb(void *data, void *file_value)
{
Eina_Bool *opened = (Eina_Bool *)data;
*opened = EINA_TRUE;
@ -89,7 +89,7 @@ _open_done_cb(void *data, void *file_value, Eina_Promise* promise EINA_UNUSED)
}
static void
_stat_done_cb(void *data, void *value, Eina_Promise* promise EINA_UNUSED)
_stat_done_cb(void *data, void *value)
{
Eina_Stat const* stat = value;
Eina_Bool *is_dir = data;
@ -284,4 +284,4 @@ eio_test_job(TCase *tc)
tcase_add_test(tc, eio_job_test_file_direct_stat);
tcase_add_test(tc, eio_job_test_open);
}
;

12
src/tests/eldbus/eldbus_test_eldbus_model.c
View File

@ -15,14 +15,14 @@
#include "eldbus_suite.h"
static void
_promise_then_quit_cb(void *data , void *value, Eina_Promise* promise EINA_UNUSED)
_promise_then_quit_cb(void *data , void *value)
{
*(void**)data = value;
ecore_main_loop_quit();
}
static void
_promise_then_quit_u_cb(void *data , void *value, Eina_Promise* promise EINA_UNUSED)
_promise_then_quit_u_cb(void *data , void *value)
{
unsigned *lhs = data;
unsigned *rhs = value;
@ -31,7 +31,7 @@ _promise_then_quit_u_cb(void *data , void *value, Eina_Promise* promise EINA_UNU
}
static void
_promise_then_cp(void *data , void *value, Eina_Promise* promise EINA_UNUSED)
_promise_then_cp(void *data , void *value)
{
eina_value_copy(value, data);
ecore_main_loop_quit();
@ -39,14 +39,14 @@ _promise_then_cp(void *data , void *value, Eina_Promise* promise EINA_UNUSED)
static void
_promise_check_err(void *data EINA_UNUSED, void *value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
_promise_check_err(void *data EINA_UNUSED, void *value EINA_UNUSED)
{
ck_assert_msg(0, "Promise Expected Error:\n");
ecore_main_loop_quit();
}
static void
_error_then_ok(void* data, Eina_Error error, Eina_Promise* promise EINA_UNUSED)
_error_then_ok(void* data, Eina_Error error)
{
Eina_Error const* expected_error = (Eina_Error*)data;
if (data != NULL)
@ -58,7 +58,7 @@ _error_then_ok(void* data, Eina_Error error, Eina_Promise* promise EINA_UNUSED)
}
static void
_error_then_cb(void* data EINA_UNUSED, Eina_Error error, Eina_Promise* promise EINA_UNUSED)
_error_then_cb(void* data EINA_UNUSED, Eina_Error error)
{
ck_assert_msg(0,"Promise ERROR: %s\n", eina_error_msg_get(error));
ecore_main_loop_quit();