浏览代码

privatize starpu-top private functions

Samuel Thibault 13 年之前
父节点
当前提交
64763d10a6
共有 5 个文件被更改,包括 31 次插入30 次删除
  1. 0 22
      include/starpu_top.h
  2. 2 2
      src/drivers/driver_common/driver_common.c
  3. 1 1
      src/sched_policies/heft.c
  4. 23 0
      src/top/starpu_top_core.h
  5. 5 5
      src/top/starpu_top_task.c

+ 0 - 22
include/starpu_top.h

@@ -200,28 +200,6 @@ void starpu_top_update_data_float(const struct starpu_top_data* data,
 				  double value);
 
 /*
- * This functions notify UI than the task has started or ended
- */
-void starpu_top_task_started(struct starpu_task *task,
-			     int devid,
-			     const struct timespec* ts);
-void starpu_top_task_ended(struct starpu_task *task,
-			   int devid,
-			   const struct timespec* ts );
-/*
- * This functions notify UI than the task have been planed to
- * run from timestamp_begin to timestamp_end, on computation-core
- */
-void starpu_top_task_prevision_timespec(struct starpu_task *task,
-					int devid,
-					const struct timespec* start,
-					const struct timespec* end);
-void starpu_top_task_prevision(struct starpu_task *task,
-			       int devid, unsigned long long start,
-			       unsigned long long end);
-
-
-/*
  * This functions are usefull in debug mode. The starpu developper doesn't need
  * to check if the debug mode is active.
  * This is checked by starpu_top itsefl.

+ 2 - 2
src/drivers/driver_common/driver_common.c

@@ -59,7 +59,7 @@ void _starpu_driver_start_job(struct _starpu_worker *args, struct _starpu_job *j
 	}
 
 	if (starpu_top)
-		starpu_top_task_started(task,workerid,codelet_start);
+		_starpu_top_task_started(task,workerid,codelet_start);
 
 	_STARPU_TRACE_START_CODELET_BODY(j);
 }
@@ -86,7 +86,7 @@ void _starpu_driver_end_job(struct _starpu_worker *args, struct _starpu_job *j,
 	}
 
 	if (starpu_top)
-	  starpu_top_task_ended(task,workerid,codelet_end);
+	  _starpu_top_task_ended(task,workerid,codelet_end);
 
 	args->status = STATUS_UNKNOWN;
 }

+ 1 - 1
src/sched_policies/heft.c

@@ -206,7 +206,7 @@ static int push_task_on_best_worker(struct starpu_task *task, int best_workerid,
 	task->predicted_transfer = predicted_transfer;
 
 	if (starpu_top_status_get())
-		starpu_top_task_prevision(task, best_workerid,
+		_starpu_top_task_prevision(task, best_workerid,
 					(unsigned long long)(exp_end[best_workerid]-predicted)/1000,
 					(unsigned long long)exp_end[best_workerid]/1000);
 

+ 23 - 0
src/top/starpu_top_core.h

@@ -19,3 +19,26 @@
  * Convert timespec to ms
  */
 unsigned long long _starpu_top_timing_timespec_to_ms(const struct timespec *ts);
+
+/*
+ * This functions notify UI than the task has started or ended
+ */
+void _starpu_top_task_started(struct starpu_task *task,
+			     int devid,
+			     const struct timespec* ts);
+void _starpu_top_task_ended(struct starpu_task *task,
+			   int devid,
+			   const struct timespec* ts );
+/*
+ * This functions notify UI than the task have been planed to
+ * run from timestamp_begin to timestamp_end, on computation-core
+ */
+void __starpu_top_task_prevision_timespec(struct starpu_task *task,
+					int devid,
+					const struct timespec* start,
+					const struct timespec* end);
+void _starpu_top_task_prevision(struct starpu_task *task,
+			       int devid, unsigned long long start,
+			       unsigned long long end);
+
+

+ 5 - 5
src/top/starpu_top_task.c

@@ -29,7 +29,7 @@
  **************TASK RELATED FUNCTIONS********
  *******************************************/
 
-void starpu_top_task_started(struct starpu_task *task,
+void _starpu_top_task_started(struct starpu_task *task,
 			     int devid,
 			     const struct timespec *ts)
 {
@@ -45,7 +45,7 @@ void starpu_top_task_started(struct starpu_task *task,
 	_starpu_top_message_add(_starpu_top_mt, str);
 }
 
-void starpu_top_task_ended(struct starpu_task *task,
+void _starpu_top_task_ended(struct starpu_task *task,
 			   int devid,
 			   const struct timespec *ts)
 {
@@ -61,18 +61,18 @@ void starpu_top_task_ended(struct starpu_task *task,
 	_starpu_top_message_add(_starpu_top_mt, str);
 }
 
-void starpu_top_task_prevision_timespec(struct starpu_task *task,
+void __starpu_top_task_prevision_timespec(struct starpu_task *task,
 					int devid,
 					const struct timespec* start,
 					const struct timespec* end)
 {
-	starpu_top_task_prevision(task,
+	_starpu_top_task_prevision(task,
 				  devid,
 				  _starpu_top_timing_timespec_to_ms(start),
 				  _starpu_top_timing_timespec_to_ms(end));
 }
 
-void starpu_top_task_prevision(struct starpu_task *task,
+void _starpu_top_task_prevision(struct starpu_task *task,
 			       int devid,
 			       unsigned long long start,
 			       unsigned long long end)