refactoring to reduce the no of different files btw trunk & this branch

src/core/jobs.c

@@ -127,8 +127,9 @@ void _starpu_wait_job(struct _starpu_job *j)
         _STARPU_LOG_OUT();
 }
 
-void _starpu_handle_job_termination(struct _starpu_job *j, int workerid)
+void _starpu_handle_job_termination(struct _starpu_job *j)
 {
+	int workerid = starpu_worker_get_id();
 	struct starpu_task *task = j->task;
 	unsigned sched_ctx = task->sched_ctx;
 	_STARPU_PTHREAD_MUTEX_LOCK(&j->sync_mutex);

src/core/jobs.h

@@ -157,7 +157,7 @@ unsigned _starpu_enforce_deps_starting_from_task(struct _starpu_job *j);
 
 /* This function must be called after the execution of a job, this triggers all
  * job's dependencies and perform the callback function if any. */
-void _starpu_handle_job_termination(struct _starpu_job *j, int workerid);
+void _starpu_handle_job_termination(struct _starpu_job *j);
 
 /* Get the sum of the size of the data accessed by the job. */
 size_t _starpu_job_get_data_size(struct starpu_perfmodel *model, enum starpu_perf_archtype arch, unsigned nimpl, struct _starpu_job *j);

src/core/sched_policy.c

@@ -356,7 +356,7 @@ int _starpu_push_task(struct _starpu_job *j)
 	 * corresponding dependencies */
 	if (task->cl == NULL)
 	{
-		_starpu_handle_job_termination(j, -1);
+		_starpu_handle_job_termination(j);
 		_STARPU_LOG_OUT_TAG("handle_job_termination");
 		return 0;
 	}

src/drivers/cpu/driver_cpu.c

@@ -300,7 +300,7 @@ int _starpu_cpu_driver_run_once(struct starpu_driver *d STARPU_ATTRIBUTE_UNUSED)
 	}
 
 	if (rank == 0)
-		_starpu_handle_job_termination(j, workerid);
+		_starpu_handle_job_termination(j);
 	return 0;
 }
 

src/drivers/cuda/driver_cuda.c

@@ -445,7 +445,7 @@ int _starpu_cuda_driver_run_once(struct starpu_driver *d)
 		}
 	}
 
-	_starpu_handle_job_termination(j, workerid);
+	_starpu_handle_job_termination(j);
 
 	return 0;
 }

src/drivers/gordon/driver_gordon.c

@@ -177,7 +177,7 @@ static struct gordon_task_wrapper_s *starpu_to_gordon_job(struct _starpu_job *j)
 static void handle_terminated_job(struct _starpu_job *j)
 {
 	_starpu_push_task_output(j, 0);
-	_starpu_handle_job_termination(j, 0);
+	_starpu_handle_job_termination(j);
 	starpu_wake_all_blocked_workers();
 }
 

src/drivers/opencl/driver_opencl.c

@@ -547,7 +547,7 @@ int _starpu_opencl_driver_run_once(struct starpu_driver *d)
 		}
 	}
 
-	_starpu_handle_job_termination(j, workerid);
+	_starpu_handle_job_termination(j);
 	return 0;
 }
 

src/sched_policies/deque_modeling_policy_data_aware.c

@@ -510,6 +510,8 @@ static void compute_all_performance_predictions(struct starpu_task *task,
 				double conversion_time = starpu_task_expected_conversion_time(task, perf_arch, nimpl);
 				if (conversion_time > 0.0)
 					local_task_length[worker_ctx][nimpl] += conversion_time;
+/* 				printf("%d[%d]/%d len %lf penalty %lf power %lf \n", worker, worker_ctx, sched_ctx_id, local_task_length[worker_ctx][nimpl],  */
+/* 					   local_data_penalty[worker_ctx][nimpl], local_power[worker_ctx][nimpl]); */
 			}
 
 			double ntasks_end = fifo->ntasks / starpu_worker_get_relative_speedup(perf_arch);
@@ -919,7 +921,7 @@ struct starpu_sched_policy _starpu_sched_dm_policy =
 	.init_sched = initialize_dmda_policy,
 	.deinit_sched = deinitialize_dmda_policy,
 	.add_workers = dmda_add_workers ,
-        .remove_workers = dmda_remove_workers,
+	.remove_workers = dmda_remove_workers,
 	.push_task = dm_push_task,
 	.pop_task = dmda_pop_task,
 	.pre_exec_hook = NULL,
@@ -934,7 +936,7 @@ struct starpu_sched_policy _starpu_sched_dmda_policy =
 	.init_sched = initialize_dmda_policy,
 	.deinit_sched = deinitialize_dmda_policy,
 	.add_workers = dmda_add_workers ,
-        .remove_workers = dmda_remove_workers,
+	.remove_workers = dmda_remove_workers,
 	.push_task = dmda_push_task,
 	.push_task_notify = dmda_push_task_notify,
 	.pop_task = dmda_pop_task,
@@ -950,7 +952,7 @@ struct starpu_sched_policy _starpu_sched_dmda_sorted_policy =
 	.init_sched = initialize_dmda_sorted_policy,
 	.deinit_sched = deinitialize_dmda_policy,
 	.add_workers = dmda_add_workers ,
-        .remove_workers = dmda_remove_workers,
+	.remove_workers = dmda_remove_workers,
 	.push_task = dmda_push_sorted_task,
 	.push_task_notify = dmda_push_task_notify,
 	.pop_task = dmda_pop_ready_task,
@@ -966,7 +968,7 @@ struct starpu_sched_policy _starpu_sched_dmda_ready_policy =
 	.init_sched = initialize_dmda_policy,
 	.deinit_sched = deinitialize_dmda_policy,
 	.add_workers = dmda_add_workers ,
-        .remove_workers = dmda_remove_workers,
+	.remove_workers = dmda_remove_workers,
 	.push_task = dmda_push_task,
 	.push_task_notify = dmda_push_task_notify,
 	.pop_task = dmda_pop_ready_task,