소스 검색

uniform name for prologue

Andra Hugo 11 년 전
부모
커밋
04e86519ef
4개의 변경된 파일9개의 추가작업 그리고 10개의 파일을 삭제
  1. 2 2
      examples/callback/prologue.c
  2. 2 2
      include/starpu_task.h
  3. 2 2
      src/core/sched_policy.c
  4. 3 4
      src/util/starpu_insert_task_utils.c

+ 2 - 2
examples/callback/prologue.c

@@ -63,8 +63,8 @@ int main(int argc, char **argv)
 
 	struct starpu_task *task = starpu_task_create();
 	task->cl = &cl;
-	task->prologue_func = callback_func;
-	task->prologue_arg = NULL;
+	task->prologue_callback_func = callback_func;
+	task->prologue_callback_arg = NULL;
 	task->handles[0] = handle;
 
 	ret = starpu_task_submit(task);

+ 2 - 2
include/starpu_task.h

@@ -126,8 +126,8 @@ struct starpu_task
 	void (*callback_func)(void *);
 	void *callback_arg;
 
-	void (*prologue_func)(void *);
-	void *prologue_arg;
+	void (*prologue_callback_func)(void *);
+	void *prologue_callback_arg;
 
 	unsigned use_tag;
 	starpu_tag_t tag_id;

+ 2 - 2
src/core/sched_policy.c

@@ -314,8 +314,8 @@ static int _starpu_nworkers_able_to_execute_task(struct starpu_task *task, struc
 int _starpu_push_task(struct _starpu_job *j)
 {
 
-	if(j->task->prologue_func)
-		j->task->prologue_func(j->task->prologue_arg);
+	if(j->task->prologue_callback_func)
+		j->task->prologue_callback_func(j->task->prologue_callback_arg);
 
 	struct starpu_task *task = j->task;
 	struct _starpu_sched_ctx *sched_ctx = _starpu_get_sched_ctx_struct(task->sched_ctx);

+ 3 - 4
src/util/starpu_insert_task_utils.c

@@ -86,8 +86,7 @@ size_t _starpu_insert_task_get_arg_size(va_list varg_list)
 		}
 		else if (arg_type==STARPU_PROLOGUE_CALLBACK_ARG)
 		{
-			va_arg(varg_list, _starpu_callback_func_t);
-			va_arg(varg_list, void *);
+			(void)va_arg(varg_list, void *);
 		}
 
 		else if (arg_type==STARPU_CALLBACK_ARG)
@@ -384,8 +383,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_arg = cl_arg_wrapper;
 
-	(*task)->prologue_func = starpu_task_insert_callback_wrapper;
-	(*task)->prologue_arg = prologue_cl_arg_wrapper;
+	(*task)->prologue_callback_func = starpu_task_insert_callback_wrapper;
+	(*task)->prologue_callback_arg = prologue_cl_arg_wrapper;
 
 	int ret = starpu_task_submit(*task);