privatize starpu-top private functions

include/starpu_top.h

@@ -82,11 +82,6 @@ enum starpu_top_message_type
 	TOP_TYPE_UNKNOW
 };
 
-/*
- * This function returns 1 if starpu_top is initialized. 0 otherwise.
- */
-int starpu_top_status_get();
-
 /*****************************************************
 ****   Functions to call BEFORE initialisation   *****
 *****************************************************/

src/core/jobs.c

@@ -75,7 +75,7 @@ struct _starpu_job* __attribute__((malloc)) _starpu_job_create(struct starpu_tas
 	job->terminated = 0;
 
 #ifndef STARPU_USE_FXT
-	if (_starpu_bound_recording || starpu_top_status_get())
+	if (_starpu_bound_recording || _starpu_top_status_get())
 #endif
 		job->job_id = STARPU_ATOMIC_ADD(&job_cnt, 1);
 #ifdef STARPU_USE_FXT

src/drivers/driver_common/driver_common.c

@@ -32,7 +32,7 @@ void _starpu_driver_start_job(struct _starpu_worker *args, struct _starpu_job *j
 	struct starpu_codelet *cl = task->cl;
 	struct starpu_task_profiling_info *profiling_info;
 	int profiling = starpu_profiling_status_get();
-	int starpu_top=starpu_top_status_get();
+	int starpu_top=_starpu_top_status_get();
 	int workerid = args->workerid;
 	unsigned calibrate_model = 0;
 
@@ -70,7 +70,7 @@ void _starpu_driver_end_job(struct _starpu_worker *args, struct _starpu_job *j,
 	struct starpu_codelet *cl = task->cl;
 	struct starpu_task_profiling_info *profiling_info = task->profiling_info;
 	int profiling = starpu_profiling_status_get();
-	int starpu_top=starpu_top_status_get();
+	int starpu_top=_starpu_top_status_get();
 	int workerid = args->workerid;
 	unsigned calibrate_model = 0;
 

src/sched_policies/heft.c

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

src/top/starpu_top.c

@@ -42,7 +42,7 @@ sem_t starpu_top_wait_for_go;
 pthread_mutex_t starpu_top_wait_for_continue_mutex;
 pthread_cond_t starpu_top_wait_for_continue_cond = PTHREAD_COND_INITIALIZER;
 
-int starpu_top_status_get()
+int _starpu_top_status_get()
 {
 	return starpu_top;
 }
@@ -393,7 +393,7 @@ struct starpu_top_param* starpu_top_register_parameter_boolean(const char* param
 							       int* parameter_field,
 							       void (*callback)(struct starpu_top_param*))
 {
-	STARPU_ASSERT(!starpu_top_status_get());
+	STARPU_ASSERT(!_starpu_top_status_get());
 	struct starpu_top_param * param = (struct starpu_top_param *) malloc(sizeof(struct starpu_top_param));
 	param->callback = callback;
 	param->name = param_name;
@@ -413,7 +413,7 @@ struct starpu_top_param* starpu_top_register_parameter_integer(const char* param
 							       int maximum_value,
 							       void (*callback)(struct starpu_top_param*))
 {
-	STARPU_ASSERT(!starpu_top_status_get());
+	STARPU_ASSERT(!_starpu_top_status_get());
 	struct starpu_top_param * param = (struct starpu_top_param *) malloc(sizeof(struct starpu_top_param));
 	param->callback = callback;
 	param->name = param_name;
@@ -435,7 +435,7 @@ struct starpu_top_param* starpu_top_register_parameter_float(const char* param_n
 							     double maximum_value,
 							     void (*callback)(struct starpu_top_param*))
 {
-	STARPU_ASSERT(!starpu_top_status_get());
+	STARPU_ASSERT(!_starpu_top_status_get());
 	struct starpu_top_param * param = (struct starpu_top_param *) malloc(sizeof(struct starpu_top_param));
 	param->callback = callback;
 	param->name = param_name;
@@ -457,7 +457,7 @@ struct starpu_top_param* starpu_top_register_parameter_enum(const char* param_na
 							    int nb_values,
 							    void (*callback)(struct starpu_top_param*))
 {
-	STARPU_ASSERT(!starpu_top_status_get());
+	STARPU_ASSERT(!_starpu_top_status_get());
 	struct starpu_top_param * param = (struct starpu_top_param *) malloc(sizeof(struct starpu_top_param));
 	param->callback = callback;
 	param->name = param_name;
@@ -478,7 +478,7 @@ struct starpu_top_param* starpu_top_register_parameter_enum(const char* param_na
 
 void starpu_top_update_data_boolean(const struct starpu_top_data* data, int value)
 {
-	if (!starpu_top_status_get())
+	if (!_starpu_top_status_get())
 		return;
 	if(data->active)
 	{
@@ -494,7 +494,7 @@ void starpu_top_update_data_boolean(const struct starpu_top_data* data, int valu
 
 void starpu_top_update_data_integer(const struct starpu_top_data* data, int value)
 {
-	if (!starpu_top_status_get())
+	if (!_starpu_top_status_get())
 		return;
 	if(data->active)
 	{
@@ -510,7 +510,7 @@ void starpu_top_update_data_integer(const struct starpu_top_data* data, int valu
 
 void starpu_top_update_data_float(const struct starpu_top_data* data, double value)
 {
-	if (!starpu_top_status_get())
+	if (!_starpu_top_status_get())
 		return;
 	if(data->active)
 	{
@@ -525,7 +525,7 @@ void starpu_top_update_data_float(const struct starpu_top_data* data, double val
 
 void starpu_top_update_parameter(const struct starpu_top_param* param)
 {
-	if (!starpu_top_status_get())
+	if (!_starpu_top_status_get())
 		return;
 	char*message = (char *) malloc(50);
 

src/top/starpu_top_core.h

@@ -21,6 +21,11 @@
 unsigned long long _starpu_top_timing_timespec_to_ms(const struct timespec *ts);
 
 /*
+ * This function returns 1 if starpu_top is initialized. 0 otherwise.
+ */
+int _starpu_top_status_get();
+
+/*
  * This functions notify UI than the task has started or ended
  */
 void _starpu_top_task_started(struct starpu_task *task,

src/top/starpu_top_task.c

@@ -34,7 +34,7 @@ void _starpu_top_task_started(struct starpu_task *task,
 			     const struct timespec *ts)
 {
 	unsigned long long taskid = _starpu_get_job_associated_to_task(task)->job_id;
-	STARPU_ASSERT(starpu_top_status_get());
+	STARPU_ASSERT(_starpu_top_status_get());
 	char *str = (char *) malloc(sizeof(char)*64);
 	snprintf(str, 64,
 				"START;%llu;%d;%llu\n",
@@ -51,7 +51,7 @@ void _starpu_top_task_ended(struct starpu_task *task,
 {
 	unsigned long long taskid = _starpu_get_job_associated_to_task(task)->job_id;
 	(void) devid; //unused
-	STARPU_ASSERT(starpu_top_status_get());
+	STARPU_ASSERT(_starpu_top_status_get());
 	char *str = (char *) malloc(sizeof(char)*64);
 	snprintf(str, 64,
 				"END;%llu;%llu\n",
@@ -78,7 +78,7 @@ void _starpu_top_task_prevision(struct starpu_task *task,
 			       unsigned long long end)
 {
 	unsigned long long taskid = _starpu_get_job_associated_to_task(task)->job_id;
-	STARPU_ASSERT(starpu_top_status_get());
+	STARPU_ASSERT(_starpu_top_status_get());
 	struct timespec now;
 	_starpu_clock_gettime(&now);
 	char * str= (char *)malloc(sizeof(char)*200);