rename free_dep_callback objects to prolog_callback objects to be consistent with field starpu_task:prolog_func

include/starpu_task_util.h

@@ -43,8 +43,8 @@ void starpu_create_sync_task(starpu_tag_t sync_tag, unsigned ndeps, starpu_tag_t
 #define STARPU_HYPERVISOR_TAG	 (1<<28)
 #define STARPU_FLOPS	         (1<<29)
 #define STARPU_SCHED_CTX	 (1<<30)
-#define STARPU_FREE_DEP_CALLBACK (1<<31)
-#define STARPU_FREE_DEP_CALLBACK_ARG (1<<32)
+#define STARPU_PROLOG_CALLBACK   (1<<31)
+#define STARPU_PROLOG_CALLBACK_ARG (1<<32)
 
 int starpu_insert_task(struct starpu_codelet *cl, ...);
 

src/util/starpu_insert_task_utils.c

@@ -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 *);
 		}
-		else if (arg_type==STARPU_FREE_DEP_CALLBACK)
+		else if (arg_type==STARPU_PROLOG_CALLBACK)
 		{
 			va_arg(varg_list, _starpu_callback_func_t);
 			va_arg(varg_list, void *);
 		}
-		else if (arg_type==STARPU_FREE_DEP_CALLBACK_ARG)
+		else if (arg_type==STARPU_PROLOG_CALLBACK_ARG)
 		{
 			(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;
 
-	struct insert_task_cb_wrapper *free_dep_cl_arg_wrapper = (struct insert_task_cb_wrapper *) malloc(sizeof(struct insert_task_cb_wrapper));
-	STARPU_ASSERT(free_dep_cl_arg_wrapper);
+	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);
 
-	free_dep_cl_arg_wrapper->callback_func = NULL;
+	prolog_cl_arg_wrapper->callback_func = NULL;
 
 	while((arg_type = va_arg(varg_list, int)) != 0)
 	{
@@ -310,16 +310,16 @@ int _starpu_insert_task_create_and_submit(void *arg_buffer, size_t arg_buffer_si
 			void *callback_arg = va_arg(varg_list, void *);
 			cl_arg_wrapper->callback_arg = callback_arg;
 		}
-		else if (arg_type==STARPU_FREE_DEP_CALLBACK)
+		else if (arg_type==STARPU_PROLOG_CALLBACK)
 		{
 			void (*callback_func)(void *);
 			void *callback_arg;
 			callback_func = va_arg(varg_list, _starpu_callback_func_t);
 			callback_arg = va_arg(varg_list, void *);
-			free_dep_cl_arg_wrapper->callback_func = callback_func;
-			free_dep_cl_arg_wrapper->callback_arg = callback_arg;
+			prolog_cl_arg_wrapper->callback_func = callback_func;
+			prolog_cl_arg_wrapper->callback_arg = callback_arg;
 		}
-		else if (arg_type==STARPU_FREE_DEP_CALLBACK_ARG)
+		else if (arg_type==STARPU_PROLOG_CALLBACK_ARG)
 		{
 			void *callback_arg = va_arg(varg_list, void *);
 			cl_arg_wrapper->callback_arg = callback_arg;
@@ -375,7 +375,7 @@ int _starpu_insert_task_create_and_submit(void *arg_buffer, size_t arg_buffer_si
 	(*task)->callback_arg = cl_arg_wrapper;
 
 	(*task)->prolog_func = starpu_task_insert_callback_wrapper;
-	(*task)->prolog_arg = cl_arg_wrapper;
+	(*task)->prolog_arg = prolog_cl_arg_wrapper;
 
 	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->model && (*task)->cl->model->symbol)?(*task)->cl->model->symbol:"none");
 		free(cl_arg_wrapper);
-		free(free_dep_cl_arg_wrapper);
+		free(prolog_cl_arg_wrapper);
 	}
 
 	return ret;