export more functions to external schedulers

src/sched_policies/deque_modeling_policy_data_aware.c

@@ -123,7 +123,7 @@ static struct starpu_task *dmda_pop_ready_task(void)
 		double model = task->predicted;
 	
 		fifo->exp_len -= model;
-		fifo->exp_start = _starpu_timing_now() + model;
+		fifo->exp_start = starpu_timing_now() + model;
 		fifo->exp_end = fifo->exp_start + fifo->exp_len;
 
 #ifdef STARPU_VERBOSE
@@ -153,7 +153,7 @@ static struct starpu_task *dmda_pop_task(void)
 		double model = task->predicted;
 	
 		fifo->exp_len -= model;
-		fifo->exp_start = _starpu_timing_now() + model;
+		fifo->exp_start = starpu_timing_now() + model;
 		fifo->exp_end = fifo->exp_start + fifo->exp_len;
 
 #ifdef STARPU_VERBOSE
@@ -188,7 +188,7 @@ static struct starpu_task *dmda_pop_every_task(void)
 		double model = new_list->predicted;
 
 		fifo->exp_len -= model;
-		fifo->exp_start = _starpu_timing_now() + model;
+		fifo->exp_start = starpu_timing_now() + model;
 		fifo->exp_end = fifo->exp_start + fifo->exp_len;
 	
 		new_list = new_list->next;
@@ -278,8 +278,8 @@ static int push_task_on_best_worker(struct starpu_task *task, int best_workerid,
 
 	unsigned memory_node = starpu_worker_get_memory_node(best_workerid);
 
-	if (_starpu_get_prefetch_flag())
-		_starpu_prefetch_task_input_on_node(task, memory_node);
+	if (starpu_get_prefetch_flag())
+		starpu_prefetch_task_input_on_node(task, memory_node);
 
 	switch (prio) {
 		case 1:
@@ -310,17 +310,17 @@ static int _dm_push_task(struct starpu_task *task, unsigned prio)
 		
 		fifo = queue_array[worker];
 
-		fifo->exp_start = STARPU_MAX(fifo->exp_start, _starpu_timing_now());
-		fifo->exp_end = STARPU_MAX(fifo->exp_end, _starpu_timing_now());
+		fifo->exp_start = STARPU_MAX(fifo->exp_start, starpu_timing_now());
+		fifo->exp_end = STARPU_MAX(fifo->exp_end, starpu_timing_now());
 
-		if (!_starpu_worker_may_execute_task(worker, task))
+		if (!starpu_worker_may_execute_task(worker, task))
 		{
 			/* no one on that queue may execute this task */
 			continue;
 		}
 
 		enum starpu_perf_archtype perf_arch = starpu_worker_get_perf_archtype(worker);
-		double local_length = _starpu_task_expected_length(task, perf_arch);
+		double local_length = starpu_task_expected_length(task, perf_arch);
 
 		if (local_length == -1.0) 
 		{
@@ -375,20 +375,20 @@ static int _dmda_push_task(struct starpu_task *task, unsigned prio)
 	{
 		fifo = queue_array[worker];
 
-		fifo->exp_start = STARPU_MAX(fifo->exp_start, _starpu_timing_now());
-		fifo->exp_end = STARPU_MAX(fifo->exp_end, _starpu_timing_now());
+		fifo->exp_start = STARPU_MAX(fifo->exp_start, starpu_timing_now());
+		fifo->exp_end = STARPU_MAX(fifo->exp_end, starpu_timing_now());
 
-		if (!_starpu_worker_may_execute_task(worker, task))
+		if (!starpu_worker_may_execute_task(worker, task))
 		{
 			/* no one on that queue may execute this task */
 			continue;
 		}
 
 		enum starpu_perf_archtype perf_arch = starpu_worker_get_perf_archtype(worker);
-		local_task_length[worker] = _starpu_task_expected_length(task, perf_arch);
+		local_task_length[worker] = starpu_task_expected_length(task, perf_arch);
 
 		unsigned memory_node = starpu_worker_get_memory_node(worker);
-		local_data_penalty[worker] = _starpu_data_expected_penalty(memory_node, task);
+		local_data_penalty[worker] = starpu_data_expected_penalty(memory_node, task);
 
 		if (local_task_length[worker] == -1.0)
 		{
@@ -413,7 +413,7 @@ static int _dmda_push_task(struct starpu_task *task, unsigned prio)
 		{
 			fifo = queue_array[worker];
 	
-			if (!_starpu_worker_may_execute_task(worker, task))
+			if (!starpu_worker_may_execute_task(worker, task))
 			{
 				/* no one on that queue may execute this task */
 				continue;

src/sched_policies/deque_queues.c

@@ -33,7 +33,7 @@ struct starpu_deque_jobq_s *_starpu_create_deque(void)
 	deque->njobs = 0;
 	deque->nprocessed = 0;
 
-	deque->exp_start = _starpu_timing_now();
+	deque->exp_start = starpu_timing_now();
 	deque->exp_len = 0.0;
 	deque->exp_end = deque->exp_start;
 
@@ -108,7 +108,7 @@ struct starpu_job_list_s *_starpu_deque_pop_every_task(struct starpu_deque_jobq_
 		{
 			next_job = starpu_job_list_next(i);
 
-			if (_starpu_worker_may_execute_task(workerid, i->task))
+			if (starpu_worker_may_execute_task(workerid, i->task))
 			{
 				/* this elements can be moved into the new list */
 				new_list_size++;

src/sched_policies/detect_combined_workers.c

@@ -21,9 +21,7 @@
 
 void _starpu_sched_find_worker_combinations(struct starpu_machine_topology_s *topology)
 {
-//#ifdef STARPU_HAVE_HWLOC
-//#error TODO !
-//#else
+#warning TODO: use hwloc instead
 	struct starpu_machine_config_s *config = _starpu_get_machine_config();
 
 	/* We put the id of all CPU workers in this array */
@@ -57,5 +55,4 @@ void _starpu_sched_find_worker_combinations(struct starpu_machine_topology_s *to
 			}
 		}
 	}
-//#endif
 }

src/sched_policies/fifo_queues.c

@@ -33,7 +33,7 @@ struct starpu_fifo_taskq_s *_starpu_create_fifo(void)
 	fifo->ntasks = 0;
 	fifo->nprocessed = 0;
 
-	fifo->exp_start = _starpu_timing_now();
+	fifo->exp_start = starpu_timing_now();
 	fifo->exp_len = 0.0;
 	fifo->exp_end = fifo->exp_start;
 
@@ -122,7 +122,7 @@ struct starpu_task *_starpu_fifo_pop_every_task(struct starpu_fifo_taskq_s *fifo
 		{
 			next_task = task->next;
 
-			if (_starpu_worker_may_execute_task(workerid, task))
+			if (starpu_worker_may_execute_task(workerid, task))
 			{
 				/* this elements can be moved into the new list */
 				new_list_size++;

src/sched_policies/parallel_heft.c

@@ -48,7 +48,7 @@ static struct starpu_task *parallel_heft_pop_task(void)
 		double model = task->predicted;
 	
 		fifo->exp_len -= model;
-		fifo->exp_start = _starpu_timing_now() + model;
+		fifo->exp_start = starpu_timing_now() + model;
 		fifo->exp_end = fifo->exp_start + fifo->exp_len;
 	}
 
@@ -67,8 +67,8 @@ static int push_task_on_best_worker(struct starpu_task *task, int best_workerid,
 	unsigned memory_node; 
 	memory_node = starpu_worker_get_memory_node(best_workerid);
 
-	if (_starpu_get_prefetch_flag())
-		_starpu_prefetch_task_input_on_node(task, memory_node);
+	if (starpu_get_prefetch_flag())
+		starpu_prefetch_task_input_on_node(task, memory_node);
 
 	if (is_basic_worker)
 	{
@@ -205,13 +205,13 @@ static int _parallel_heft_push_task(struct starpu_task *task, unsigned prio)
 	for (worker = 0; worker < nworkers; worker++)
 	{
 		fifo = queue_array[worker];
-		fifo->exp_start = STARPU_MAX(fifo->exp_start, _starpu_timing_now());
-		fifo->exp_end = STARPU_MAX(fifo->exp_end, _starpu_timing_now());
+		fifo->exp_start = STARPU_MAX(fifo->exp_start, starpu_timing_now());
+		fifo->exp_end = STARPU_MAX(fifo->exp_end, starpu_timing_now());
 	}
 
 	for (worker = 0; worker < (nworkers+ncombinedworkers); worker++)
 	{
-		if (!_starpu_combined_worker_may_execute_task(worker, task))
+		if (!starpu_combined_worker_may_execute_task(worker, task))
 		{
 			/* no one on that queue may execute this task */
 			skip_worker[worker] = 1;
@@ -222,10 +222,10 @@ static int _parallel_heft_push_task(struct starpu_task *task, unsigned prio)
 		}
 
 		enum starpu_perf_archtype perf_arch = starpu_worker_get_perf_archtype(worker);
-		local_task_length[worker] = _starpu_task_expected_length(task, perf_arch);
+		local_task_length[worker] = starpu_task_expected_length(task, perf_arch);
 
 		unsigned memory_node = starpu_worker_get_memory_node(worker);
-		local_data_penalty[worker] = _starpu_data_expected_penalty(memory_node, task);
+		local_data_penalty[worker] = starpu_data_expected_penalty(memory_node, task);
 
 		if (local_task_length[worker] == -1.0)
 		{

src/sched_policies/random_policy.c

@@ -48,7 +48,7 @@ static int _random_push_task(struct starpu_task *task, unsigned prio)
 	for (worker = 0; worker < nworkers; worker++)
 	{
 		enum starpu_perf_archtype perf_arch = starpu_worker_get_perf_archtype(worker);
-		alpha_sum += _starpu_worker_get_relative_speedup(perf_arch);
+		alpha_sum += starpu_worker_get_relative_speedup(perf_arch);
 	}
 
 	double random = starpu_drand48()*alpha_sum;
@@ -58,7 +58,7 @@ static int _random_push_task(struct starpu_task *task, unsigned prio)
 	for (worker = 0; worker < nworkers; worker++)
 	{
 		enum starpu_perf_archtype perf_arch = starpu_worker_get_perf_archtype(worker);
-		double worker_alpha = _starpu_worker_get_relative_speedup(perf_arch);
+		double worker_alpha = starpu_worker_get_relative_speedup(perf_arch);
 
 		if (alpha + worker_alpha > random) {
 			/* we found the worker */

src/sched_policies/stack_queues.c

@@ -39,7 +39,7 @@ struct starpu_stack_jobq_s *_starpu_create_stack(void)
 	stack->njobs = 0;
 	stack->nprocessed = 0;
 
-	stack->exp_start = _starpu_timing_now();
+	stack->exp_start = starpu_timing_now();
 	stack->exp_len = 0.0;
 	stack->exp_end = stack->exp_start;