浏览代码

fixed one test

Andra Hugo 13 年之前
父节点
当前提交
9866c56c3e
共有 3 个文件被更改,包括 5 次插入6 次删除
  1. 1 0
      src/core/jobs.c
  2. 2 5
      src/core/sched_ctx.c
  3. 2 1
      src/core/task.c

+ 1 - 0
src/core/jobs.c

@@ -250,6 +250,7 @@ void _starpu_handle_job_termination(struct _starpu_job *j, int workerid)
 		int ret = _starpu_submit_job(j);
 		STARPU_ASSERT(!ret);
 	}
+
 	_starpu_decrement_nsubmitted_tasks();
 	_starpu_decrement_nready_tasks();
 

+ 2 - 5
src/core/sched_ctx.c

@@ -303,11 +303,8 @@ void _starpu_delete_all_sched_ctxs()
 		struct _starpu_sched_ctx *sched_ctx = _starpu_get_sched_ctx_struct(i);
 		if(sched_ctx->id != STARPU_NMAX_SCHED_CTXS)
 		{
-			if(!_starpu_wait_for_all_tasks_of_sched_ctx(sched_ctx->id))
-			{
-				_starpu_barrier_counter_destroy(&sched_ctx->tasks_barrier);
-				_starpu_delete_sched_ctx(sched_ctx);
-			}
+			_starpu_barrier_counter_destroy(&sched_ctx->tasks_barrier);
+			_starpu_delete_sched_ctx(sched_ctx);
 		}
 	}
 	return;

+ 2 - 1
src/core/task.c

@@ -219,7 +219,6 @@ int _starpu_submit_job(struct _starpu_job *j)
 
 	_starpu_increment_nsubmitted_tasks();
 	_starpu_increment_nsubmitted_tasks_of_sched_ctx(j->task->sched_ctx);
-
 	_STARPU_PTHREAD_MUTEX_LOCK(&j->sync_mutex);
 
 	/* Need to atomically set submitted to 1 and check dependencies, since
@@ -466,6 +465,7 @@ int _starpu_task_submit_nodeps(struct starpu_task *task)
 
 	struct _starpu_job *j = _starpu_get_job_associated_to_task(task);
 	_starpu_increment_nsubmitted_tasks();
+	_starpu_increment_nsubmitted_tasks_of_sched_ctx(j->task->sched_ctx);
 	_STARPU_PTHREAD_MUTEX_LOCK(&j->sync_mutex);
 
 	j->submitted = 1;
@@ -507,6 +507,7 @@ int _starpu_task_submit_conversion_task(struct starpu_task *task,
 
 	struct _starpu_job *j = _starpu_get_job_associated_to_task(task);
 	_starpu_increment_nsubmitted_tasks();
+	_starpu_increment_nsubmitted_tasks_of_sched_ctx(j->task->sched_ctx);
 	_STARPU_PTHREAD_MUTEX_LOCK(&j->sync_mutex);
 	j->submitted = 1;
 	_starpu_increment_nready_tasks();