diff --git a/src/lib/eina/eina_inline_lock_barrier.x b/src/lib/eina/eina_inline_lock_barrier.x index 536e26c6d5..055887f85b 100644 --- a/src/lib/eina/eina_inline_lock_barrier.x +++ b/src/lib/eina/eina_inline_lock_barrier.x @@ -3,7 +3,7 @@ typedef struct _Eina_Barrier Eina_Barrier; struct _Eina_Barrier { int needed, called; - Eina_Lock lock, cond_lock; + Eina_Lock cond_lock; Eina_Condition cond; }; @@ -12,8 +12,6 @@ eina_barrier_new(Eina_Barrier *barrier, int needed) { barrier->needed = needed; barrier->called = 0; - if (!eina_lock_new(&(barrier->lock))) - return EINA_FALSE; if (!eina_lock_new(&(barrier->cond_lock))) return EINA_FALSE; if (!eina_condition_new(&(barrier->cond), &(barrier->cond_lock))) @@ -26,7 +24,6 @@ eina_barrier_free(Eina_Barrier *barrier) { eina_condition_free(&(barrier->cond)); eina_lock_free(&(barrier->cond_lock)); - eina_lock_free(&(barrier->lock)); barrier->needed = 0; barrier->called = 0; } @@ -34,7 +31,7 @@ eina_barrier_free(Eina_Barrier *barrier) static inline Eina_Bool eina_barrier_wait(Eina_Barrier *barrier) { - eina_lock_take(&(barrier->lock)); + eina_lock_take(&(barrier->cond_lock)); barrier->called++; if (barrier->called == barrier->needed) { @@ -43,6 +40,6 @@ eina_barrier_wait(Eina_Barrier *barrier) } else eina_condition_wait(&(barrier->cond)); - eina_lock_release(&(barrier->lock)); + eina_lock_release(&(barrier->cond_lock)); return EINA_TRUE; }