|
@@ -172,12 +172,12 @@ int _starpu_codelet_pack_args(void **arg_buffer, size_t arg_buffer_size, va_list
|
|
{
|
|
{
|
|
(void)va_arg(varg_list, void *);
|
|
(void)va_arg(varg_list, void *);
|
|
}
|
|
}
|
|
- else if (arg_type==STARPU_PROLOG_CALLBACK)
|
|
|
|
|
|
+ else if (arg_type==STARPU_PROLOGUE_CALLBACK)
|
|
{
|
|
{
|
|
va_arg(varg_list, _starpu_callback_func_t);
|
|
va_arg(varg_list, _starpu_callback_func_t);
|
|
va_arg(varg_list, void *);
|
|
va_arg(varg_list, void *);
|
|
}
|
|
}
|
|
- else if (arg_type==STARPU_PROLOG_CALLBACK_ARG)
|
|
|
|
|
|
+ else if (arg_type==STARPU_PROLOGUE_CALLBACK_ARG)
|
|
{
|
|
{
|
|
(void)va_arg(varg_list, void *);
|
|
(void)va_arg(varg_list, void *);
|
|
}
|
|
}
|
|
@@ -237,10 +237,10 @@ int _starpu_insert_task_create_and_submit(void *arg_buffer, size_t arg_buffer_si
|
|
|
|
|
|
cl_arg_wrapper->callback_func = NULL;
|
|
cl_arg_wrapper->callback_func = NULL;
|
|
|
|
|
|
- struct insert_task_cb_wrapper *prolog_cl_arg_wrapper = (struct insert_task_cb_wrapper *) malloc(sizeof(struct insert_task_cb_wrapper));
|
|
|
|
- STARPU_ASSERT(prolog_cl_arg_wrapper);
|
|
|
|
|
|
+ struct insert_task_cb_wrapper *prologue_cl_arg_wrapper = (struct insert_task_cb_wrapper *) malloc(sizeof(struct insert_task_cb_wrapper));
|
|
|
|
+ STARPU_ASSERT(prologue_cl_arg_wrapper);
|
|
|
|
|
|
- prolog_cl_arg_wrapper->callback_func = NULL;
|
|
|
|
|
|
+ prologue_cl_arg_wrapper->callback_func = NULL;
|
|
|
|
|
|
while((arg_type = va_arg(varg_list, int)) != 0)
|
|
while((arg_type = va_arg(varg_list, int)) != 0)
|
|
{
|
|
{
|
|
@@ -310,19 +310,19 @@ int _starpu_insert_task_create_and_submit(void *arg_buffer, size_t arg_buffer_si
|
|
void *callback_arg = va_arg(varg_list, void *);
|
|
void *callback_arg = va_arg(varg_list, void *);
|
|
cl_arg_wrapper->callback_arg = callback_arg;
|
|
cl_arg_wrapper->callback_arg = callback_arg;
|
|
}
|
|
}
|
|
- else if (arg_type==STARPU_PROLOG_CALLBACK)
|
|
|
|
|
|
+ else if (arg_type==STARPU_PROLOGUE_CALLBACK)
|
|
{
|
|
{
|
|
void (*callback_func)(void *);
|
|
void (*callback_func)(void *);
|
|
void *callback_arg;
|
|
void *callback_arg;
|
|
callback_func = va_arg(varg_list, _starpu_callback_func_t);
|
|
callback_func = va_arg(varg_list, _starpu_callback_func_t);
|
|
callback_arg = va_arg(varg_list, void *);
|
|
callback_arg = va_arg(varg_list, void *);
|
|
- prolog_cl_arg_wrapper->callback_func = callback_func;
|
|
|
|
- prolog_cl_arg_wrapper->callback_arg = callback_arg;
|
|
|
|
|
|
+ prologue_cl_arg_wrapper->callback_func = callback_func;
|
|
|
|
+ prologue_cl_arg_wrapper->callback_arg = callback_arg;
|
|
}
|
|
}
|
|
- else if (arg_type==STARPU_PROLOG_CALLBACK_ARG)
|
|
|
|
|
|
+ else if (arg_type==STARPU_PROLOGUE_CALLBACK_ARG)
|
|
{
|
|
{
|
|
void *callback_arg = va_arg(varg_list, void *);
|
|
void *callback_arg = va_arg(varg_list, void *);
|
|
- prolog_cl_arg_wrapper->callback_arg = callback_arg;
|
|
|
|
|
|
+ prologue_cl_arg_wrapper->callback_arg = callback_arg;
|
|
}
|
|
}
|
|
else if (arg_type==STARPU_PRIORITY)
|
|
else if (arg_type==STARPU_PRIORITY)
|
|
{
|
|
{
|
|
@@ -374,8 +374,8 @@ int _starpu_insert_task_create_and_submit(void *arg_buffer, size_t arg_buffer_si
|
|
(*task)->callback_func = starpu_task_insert_callback_wrapper;
|
|
(*task)->callback_func = starpu_task_insert_callback_wrapper;
|
|
(*task)->callback_arg = cl_arg_wrapper;
|
|
(*task)->callback_arg = cl_arg_wrapper;
|
|
|
|
|
|
- (*task)->prolog_func = starpu_task_insert_callback_wrapper;
|
|
|
|
- (*task)->prolog_arg = prolog_cl_arg_wrapper;
|
|
|
|
|
|
+ (*task)->prologue_func = starpu_task_insert_callback_wrapper;
|
|
|
|
+ (*task)->prologue_arg = prologue_cl_arg_wrapper;
|
|
|
|
|
|
int ret = starpu_task_submit(*task);
|
|
int ret = starpu_task_submit(*task);
|
|
|
|
|
|
@@ -387,7 +387,7 @@ int _starpu_insert_task_create_and_submit(void *arg_buffer, size_t arg_buffer_si
|
|
(*task)->cl->name ? (*task)->cl->name :
|
|
(*task)->cl->name ? (*task)->cl->name :
|
|
((*task)->cl->model && (*task)->cl->model->symbol)?(*task)->cl->model->symbol:"none");
|
|
((*task)->cl->model && (*task)->cl->model->symbol)?(*task)->cl->model->symbol:"none");
|
|
free(cl_arg_wrapper);
|
|
free(cl_arg_wrapper);
|
|
- free(prolog_cl_arg_wrapper);
|
|
|
|
|
|
+ free(prologue_cl_arg_wrapper);
|
|
}
|
|
}
|
|
|
|
|
|
return ret;
|
|
return ret;
|