Browse Source

Unblock the second instance of starpu at shutdown - initial blocking = feature or bug?

Andra Hugo 14 years ago
parent
commit
467c053580
2 changed files with 4 additions and 2 deletions
  1. 4 1
      src/core/workers.c
  2. 0 1
      src/sched_policies/eager_central_policy.c

+ 4 - 1
src/core/workers.c

@@ -465,9 +465,12 @@ void starpu_shutdown(void)
 	const char *stats;
 	const char *stats;
 	PTHREAD_MUTEX_LOCK(&init_mutex);
 	PTHREAD_MUTEX_LOCK(&init_mutex);
 	init_count--;
 	init_count--;
-	if (init_count)
+	if (init_count){
+		/* blocking if two instances of starpu - bug or functionality?*/
+		PTHREAD_MUTEX_UNLOCK(&init_mutex);
 		/* Still somebody needing StarPU, don't deinitialize */
 		/* Still somebody needing StarPU, don't deinitialize */
 		return;
 		return;
+	}
 	/* We're last */
 	/* We're last */
 	initialized = CHANGING;
 	initialized = CHANGING;
 	PTHREAD_MUTEX_UNLOCK(&init_mutex);
 	PTHREAD_MUTEX_UNLOCK(&init_mutex);

+ 0 - 1
src/sched_policies/eager_central_policy.c

@@ -64,7 +64,6 @@ static int push_task_eager_policy(struct starpu_task *task, struct starpu_sched_
 		_starpu_increment_nsubmitted_tasks_of_worker(workerid);
 		_starpu_increment_nsubmitted_tasks_of_worker(workerid);
 	}
 	}
 
 
-	printf("task %s pushed on central fifo\n", task->name);
 	return _starpu_fifo_push_task(fifo, &sched_mutex, &sched_cond, task);
 	return _starpu_fifo_push_task(fifo, &sched_mutex, &sched_cond, task);
 }
 }