Browse Source

do not test the submitted field of jobs to know whether the task has just terminated, since terminated tasks have submitted==0

Samuel Thibault 13 years ago
parent
commit
04e97c5578
3 changed files with 4 additions and 4 deletions
  1. 2 2
      src/core/dependencies/cg.c
  2. 1 1
      src/core/dependencies/tags.c
  3. 1 1
      src/core/task.c

+ 2 - 2
src/core/dependencies/cg.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010-2011  Université de Bordeaux 1
+ * Copyright (C) 2010-2012  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -196,7 +196,7 @@ void _starpu_notify_cg_list(struct _starpu_cg_list *successors)
 			unsigned must_destroy_task = 0;
 			struct starpu_task *task = j->task;
 
-			if (j->submitted && (j->terminated > 0) && task->destroy && task->detach)
+			if (j->terminated > 0 && task->destroy && task->detach)
 				must_destroy_task = 1;
 
 			_STARPU_PTHREAD_MUTEX_UNLOCK(&j->sync_mutex);

+ 1 - 1
src/core/dependencies/tags.c

@@ -176,7 +176,7 @@ void _starpu_tag_set_ready(struct _starpu_tag *tag)
 	/* enforce data dependencies */
 	_starpu_enforce_deps_starting_from_task(j, 1);
 
-	int must_destroy = j->submitted && j->terminated > 0 && j->task->destroy && j->task->detach;
+	int must_destroy = j->terminated > 0 && j->task->destroy && j->task->detach;
 
 	_STARPU_PTHREAD_MUTEX_UNLOCK(&j->sync_mutex);
 

+ 1 - 1
src/core/task.c

@@ -211,7 +211,7 @@ int _starpu_submit_job(struct _starpu_job *j)
 	j->submitted = 1;
 
 	int ret = _starpu_enforce_deps_and_schedule(j, 1);
-	int must_destroy = j->submitted && j->terminated > 0 && j->task->destroy && j->task->detach;
+	int must_destroy = j->terminated > 0 && j->task->destroy && j->task->detach;
 
 	_STARPU_PTHREAD_MUTEX_UNLOCK(&j->sync_mutex);