Merge from trunk @11930:11937

src/common/barrier_counter.c

@@ -118,9 +118,9 @@ int _starpu_barrier_counter_get_reached_start(struct _starpu_barrier_counter *ba
 {
 	struct _starpu_barrier *barrier = &barrier_c->barrier;
 	int ret;
-//	STARPU_PTHREAD_MUTEX_LOCK(&barrier->mutex);
+	STARPU_PTHREAD_MUTEX_LOCK(&barrier->mutex);
 	ret = barrier->reached_start;
-//	STARPU_PTHREAD_MUTEX_UNLOCK(&barrier->mutex);
+	STARPU_PTHREAD_MUTEX_UNLOCK(&barrier->mutex);
 	return ret;
 }
 
@@ -128,8 +128,8 @@ double _starpu_barrier_counter_get_reached_flops(struct _starpu_barrier_counter
 {
 	struct _starpu_barrier *barrier = &barrier_c->barrier;
 	double ret;
-//	STARPU_PTHREAD_MUTEX_LOCK(&barrier->mutex);
+	STARPU_PTHREAD_MUTEX_LOCK(&barrier->mutex);
 	ret = barrier->reached_flops;
-//	STARPU_PTHREAD_MUTEX_UNLOCK(&barrier->mutex);
+	STARPU_PTHREAD_MUTEX_UNLOCK(&barrier->mutex);
 	return ret;
 }

src/core/sched_ctx.c

@@ -896,7 +896,7 @@ void _starpu_increment_nsubmitted_tasks_of_sched_ctx(unsigned sched_ctx_id)
 int _starpu_get_nsubmitted_tasks_of_sched_ctx(unsigned sched_ctx_id)
 {
 	struct _starpu_sched_ctx *sched_ctx = _starpu_get_sched_ctx_struct(sched_ctx_id);
-	return sched_ctx->tasks_barrier.barrier.reached_start;
+	return _starpu_barrier_counter_get_reached_start(&sched_ctx->tasks_barrier);
 }
 
 int _starpu_check_nsubmitted_tasks_of_sched_ctx(unsigned sched_ctx_id)