barrier

src/common/barrier_counter.c

@@ -40,7 +40,7 @@ int _starpu_barrier_counter_destroy(struct _starpu_barrier_counter_t *barrier_c)
 
 int _starpu_barrier_counter_wait_for_empty_counter(struct _starpu_barrier_counter_t *barrier_c)
 {
-	_starpu_barrier_t *barrier = &barrier_c->barrier;
+	_starpu_barrier *barrier = &barrier_c->barrier;
 	PTHREAD_MUTEX_LOCK(&barrier->mutex);
 
 	while (barrier->reached_start > 0)
@@ -52,7 +52,7 @@ int _starpu_barrier_counter_wait_for_empty_counter(struct _starpu_barrier_counte
 
 int _starpu_barrier_counter_wait_for_full_counter(struct _starpu_barrier_counter_t *barrier_c)
 {
-	_starpu_barrier_t *barrier = &barrier_c->barrier;
+	_starpu_barrier *barrier = &barrier_c->barrier;
 	PTHREAD_MUTEX_LOCK(&barrier->mutex);
 
 	while (barrier->reached_start < barrier->count)
@@ -64,7 +64,7 @@ int _starpu_barrier_counter_wait_for_full_counter(struct _starpu_barrier_counter
 
 int _starpu_barrier_counter_decrement_until_empty_counter(struct _starpu_barrier_counter_t *barrier_c)
 {
-	_starpu_barrier_t *barrier = &barrier_c->barrier;
+	_starpu_barrier *barrier = &barrier_c->barrier;
 	PTHREAD_MUTEX_LOCK(&barrier->mutex);
 
 	if (--barrier->reached_start == 0)
@@ -76,7 +76,7 @@ int _starpu_barrier_counter_decrement_until_empty_counter(struct _starpu_barrier
 
 int _starpu_barrier_counter_increment_until_full_counter(struct _starpu_barrier_counter_t *barrier_c)
 {
-	_starpu_barrier_t *barrier = &barrier_c->barrier;
+	_starpu_barrier *barrier = &barrier_c->barrier;
 	PTHREAD_MUTEX_LOCK(&barrier->mutex);
 	
 	if(++barrier->reached_start == barrier->count)
@@ -88,7 +88,7 @@ int _starpu_barrier_counter_increment_until_full_counter(struct _starpu_barrier_
 
 int _starpu_barrier_counter_increment(struct _starpu_barrier_counter_t *barrier_c)
 {
-	_starpu_barrier_t *barrier = &barrier_c->barrier;
+	_starpu_barrier *barrier = &barrier_c->barrier;
 	PTHREAD_MUTEX_LOCK(&barrier->mutex);
 
 	barrier->reached_start++;

src/common/barrier_counter.h

@@ -17,11 +17,11 @@
 #include <common/barrier.h>
 
 struct _starpu_barrier_counter_t {
-	_starpu_barrier_t barrier;
+	_starpu_barrier barrier;
 	pthread_cond_t cond2;
 };
 
-int _starpu_barrier_counter_init(struct _starpu_barrier_counter_t *barrier_c, int count);
+int _starpu_barrier_counter_init(struct _starpu_barrier_counter_ *barrier_c, int count);
 
 int _starpu_barrier_counter_update(struct _starpu_barrier_counter_t *barrier_c, int count);