浏览代码

cosmetic changes

Nathalie Furmento 4 年之前
父节点
当前提交
270006fd42
共有 2 个文件被更改,包括 11 次插入10 次删除
  1. 10 9
      include/starpu_task.h
  2. 1 1
      src/core/jobs.c

+ 10 - 9
include/starpu_task.h

@@ -771,17 +771,17 @@ struct starpu_task
 
 
 	/**
 	/**
 	   Optional pointer which points to the return value of submitted task.
 	   Optional pointer which points to the return value of submitted task.
-	   The default value is <c>NULL</c>. starpu_codelet_pack_arg() 
+	   The default value is <c>NULL</c>. starpu_codelet_pack_arg()
 	   and starpu_codelet_unpack_arg() can be used to respectively
 	   and starpu_codelet_unpack_arg() can be used to respectively
-	   pack and unpack the return value into and form it. starpu_task::cl_ret 
+	   pack and unpack the return value into and form it. starpu_task::cl_ret
 	   can be used for MPI support. The only requirement is that
 	   can be used for MPI support. The only requirement is that
 	   the size of the return value must be set in starpu_task::cl_ret_size .
 	   the size of the return value must be set in starpu_task::cl_ret_size .
 	*/
 	*/
 	void *cl_ret;
 	void *cl_ret;
 
 
 	/**
 	/**
-	   Optional field. The buffer of starpu_codelet_pack_arg() 
-	   and starpu_codelet_unpack_arg() can be allocated with 
+	   Optional field. The buffer of starpu_codelet_pack_arg()
+	   and starpu_codelet_unpack_arg() can be allocated with
 	   the starpu_task::cl_ret_size bytes starting at address starpu_task::cl_ret.
 	   the starpu_task::cl_ret_size bytes starting at address starpu_task::cl_ret.
 	   starpu_task::cl_ret_size can be used for MPI supoort.
 	   starpu_task::cl_ret_size can be used for MPI supoort.
 	*/
 	*/
@@ -804,6 +804,7 @@ struct starpu_task
 	   pointer and the argument.
 	   pointer and the argument.
 	*/
 	*/
 	void (*callback_func)(void *);
 	void (*callback_func)(void *);
+
 	/**
 	/**
 	   Optional field, the default value is <c>NULL</c>. This is
 	   Optional field, the default value is <c>NULL</c>. This is
 	   the pointer passed to the callback function. This field is
 	   the pointer passed to the callback function. This field is
@@ -822,11 +823,12 @@ struct starpu_task
 	   Optional field, the default value is <c>NULL</c>. This is a
 	   Optional field, the default value is <c>NULL</c>. This is a
 	   function pointer of prototype <c>void (*f)(void *)</c> which specifies
 	   function pointer of prototype <c>void (*f)(void *)</c> which specifies
 	   a possible callback just as starpu_task::callback_func. But this function
 	   a possible callback just as starpu_task::callback_func. But this function
-	   is executed before task dependencies release. The callback is passed 
-	   the value contained in the starpu_task::epilogue_callback_arg field. 
+	   is executed before task dependencies release. The callback is passed
+	   the value contained in the starpu_task::epilogue_callback_arg field.
 	   No callback is executed if the field is set to <c>NULL</c>.
 	   No callback is executed if the field is set to <c>NULL</c>.
 	*/
 	*/
 	void (*epilogue_callback_func)(void *);
 	void (*epilogue_callback_func)(void *);
+
 	/**
 	/**
 	   Optional field, the default value is <c>NULL</c>. This is
 	   Optional field, the default value is <c>NULL</c>. This is
 	   the pointer passed to the epilogue callback function. This field is
 	   the pointer passed to the epilogue callback function. This field is
@@ -931,7 +933,6 @@ struct starpu_task
 	*/
 	*/
 	unsigned callback_arg_free:1;
 	unsigned callback_arg_free:1;
 
 
-
 	/**
 	/**
 	   Optional field. In case starpu_task::epilogue_callback_arg was
 	   Optional field. In case starpu_task::epilogue_callback_arg was
 	   allocated by the application through <c>malloc()</c>,
 	   allocated by the application through <c>malloc()</c>,
@@ -1342,8 +1343,8 @@ struct starpu_task
 	.cl_ret_size = 0,				\
 	.cl_ret_size = 0,				\
 	.callback_func = NULL,				\
 	.callback_func = NULL,				\
 	.callback_arg = NULL,				\
 	.callback_arg = NULL,				\
-	.epilogue_callback_func = NULL,				\
-	.epilogue_callback_arg = NULL,				\
+	.epilogue_callback_func = NULL,			\
+	.epilogue_callback_arg = NULL,			\
 	.priority = STARPU_DEFAULT_PRIO,		\
 	.priority = STARPU_DEFAULT_PRIO,		\
 	.use_tag = 0,					\
 	.use_tag = 0,					\
 	.sequential_consistency = 1,			\
 	.sequential_consistency = 1,			\

+ 1 - 1
src/core/jobs.c

@@ -296,7 +296,7 @@ void _starpu_handle_job_termination(struct _starpu_job *j)
 	unsigned sched_ctx = task->sched_ctx;
 	unsigned sched_ctx = task->sched_ctx;
 	double flops = task->flops;
 	double flops = task->flops;
 	void (*epilogue_callback)(void *) = task->epilogue_callback_func;
 	void (*epilogue_callback)(void *) = task->epilogue_callback_func;
-	
+
 	const unsigned continuation =
 	const unsigned continuation =
 #ifdef STARPU_OPENMP
 #ifdef STARPU_OPENMP
 		j->continuation
 		j->continuation