Replace _starpu_job_expected_length by _starpu_task_expected_length which takes

a task instead of a job.

src/core/perfmodel/perfmodel.c

@@ -119,9 +119,9 @@ static double common_task_expected_length(struct starpu_perfmodel_t *model, int
 	return -1.0;
 }
 
-double _starpu_job_expected_length(int workerid, struct starpu_job_s *j, enum starpu_perf_archtype arch)
+double _starpu_task_expected_length(int workerid, struct starpu_task *task, enum starpu_perf_archtype arch)
 {
-	struct starpu_task *task = j->task;
+	starpu_job_t j = _starpu_get_job_associated_to_task(task);
 	struct starpu_perfmodel_t *model = task->cl->model;
 
 	if (model) {

src/core/perfmodel/perfmodel.h

@@ -91,7 +91,7 @@ void _starpu_register_model(struct starpu_perfmodel_t *model);
 void _starpu_initialize_registered_performance_models(void);
 void _starpu_deinitialize_registered_performance_models(void);
 
-double _starpu_job_expected_length(int workerid, struct starpu_job_s *j, enum starpu_perf_archtype arch);
+double _starpu_task_expected_length(int workerid, struct starpu_task *task, enum starpu_perf_archtype arch);
 double _starpu_regression_based_job_expected_length(struct starpu_perfmodel_t *model,
 					enum starpu_perf_archtype arch, struct starpu_job_s *j);
 void _starpu_update_perfmodel_history(struct starpu_job_s *j, enum starpu_perf_archtype arch,

src/core/policies/deque_modeling_policy.c

@@ -70,8 +70,6 @@ static struct starpu_task *dm_pop_every_task(uint32_t where)
 
 static int _dm_push_task(struct starpu_task *task, unsigned prio)
 {
-	starpu_job_t j = _starpu_get_job_associated_to_task(task);
-
 	/* find the queue */
 	struct starpu_fifo_jobq_s *fifo;
 	unsigned worker;
@@ -96,7 +94,7 @@ static int _dm_push_task(struct starpu_task *task, unsigned prio)
 		}
 
 		enum starpu_perf_archtype perf_arch = starpu_worker_get_perf_archtype(worker);
-		double local_length = _starpu_job_expected_length(worker, j, perf_arch);
+		double local_length = _starpu_task_expected_length(worker, task, perf_arch);
 
 		if (local_length == -1.0) 
 		{

src/core/policies/deque_modeling_policy_data_aware.c

@@ -60,8 +60,6 @@ static void update_data_requests(uint32_t memory_node, struct starpu_task *task)
 
 static int _dmda_push_task(struct starpu_task *task, unsigned prio)
 {
-	starpu_job_t j = _starpu_get_job_associated_to_task(task);
-
 	/* find the queue */
 	struct starpu_fifo_jobq_s *fifo;
 	unsigned worker;
@@ -95,7 +93,7 @@ static int _dmda_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_job_expected_length(worker,	j, perf_arch);
+		local_task_length[worker] = _starpu_task_expected_length(worker, task, perf_arch);
 
 		unsigned memory_node = starpu_worker_get_memory_node(worker);
 		local_data_penalty[worker] = _starpu_data_expected_penalty(memory_node, task);