ソースを参照

src: minor fixes

Nathalie Furmento 10 年 前
コミット
6a678b8037
共有3 個のファイルを変更した3 個の追加4 個の削除を含む
  1. 1 1
      src/core/jobs.c
  2. 0 1
      src/drivers/driver_common/driver_common.c
  3. 2 2
      src/sched_policies/parallel_eager.c

+ 1 - 1
src/core/jobs.c

@@ -193,7 +193,6 @@ void _starpu_handle_job_termination(struct _starpu_job *j)
 {
 	struct starpu_task *task = j->task;
 	unsigned sched_ctx = task->sched_ctx;
-	int workerid = starpu_worker_get_id();
 	double flops = task->flops;
 	const unsigned continuation =
 #ifdef STARPU_OPENMP
@@ -342,6 +341,7 @@ void _starpu_handle_job_termination(struct _starpu_job *j)
 	{
 		_starpu_sched_post_exec_hook(task);
 #ifdef STARPU_USE_SC_HYPERVISOR
+		int workerid = starpu_worker_get_id();
 		_starpu_sched_ctx_post_exec_task_cb(workerid, task, data_size, j->footprint);
 #endif //STARPU_USE_SC_HYPERVISOR
 

+ 0 - 1
src/drivers/driver_common/driver_common.c

@@ -115,7 +115,6 @@ void _starpu_driver_end_job(struct _starpu_worker *worker, struct _starpu_job *j
 
 	// Find out if the worker is the master of a parallel context
 	struct _starpu_sched_ctx *sched_ctx = _starpu_sched_ctx_get_sched_ctx_for_worker_and_job(worker, j);
-	unsigned worker_left_ctx = 0;
 	if(!sched_ctx)
 		sched_ctx = _starpu_get_sched_ctx_struct(j->task->sched_ctx);
 

+ 2 - 2
src/sched_policies/parallel_eager.c

@@ -155,11 +155,11 @@ static int push_task_peager_policy(struct starpu_task *task)
 	starpu_push_task_end(task);
 	STARPU_PTHREAD_MUTEX_UNLOCK(&data->policy_mutex);
 
-	/*if there are no tasks block */
+#ifndef STARPU_NON_BLOCKING_DRIVERS
+	/* if there are no tasks block */
 	/* wake people waiting for a task */
 	struct starpu_worker_collection *workers = starpu_sched_ctx_get_worker_collection(sched_ctx_id);
 
-#ifndef STARPU_NON_BLOCKING_DRIVERS
 	struct starpu_sched_ctx_iterator it;
 	int worker = -1;