diff options
author | Timothy Arceri <[email protected]> | 2017-03-05 12:12:30 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-03-07 08:52:38 +1100 |
commit | ba72554f3e576c1674d52ab16d8d2edff9398b71 (patch) | |
tree | 317c80f33ea1edcf238d3545ff1a6104a7d55fc8 /src/gallium/auxiliary/os/os_thread.h | |
parent | be188289e1bf0e259c91a751c405d54bb99bc5d4 (diff) |
gallium/util: replace pipe_mutex_lock() with mtx_lock()
replace pipe_mutex_lock() was made unnecessary with fd33a6bcd7f12.
Replaced using:
find ./src -type f -exec sed -i -- \
's:pipe_mutex_lock(\([^)]*\)):mtx_lock(\&\1):g' {} \;
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/os/os_thread.h')
-rw-r--r-- | src/gallium/auxiliary/os/os_thread.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/gallium/auxiliary/os/os_thread.h b/src/gallium/auxiliary/os/os_thread.h index 571e3c68dae..5b759659cae 100644 --- a/src/gallium/auxiliary/os/os_thread.h +++ b/src/gallium/auxiliary/os/os_thread.h @@ -108,9 +108,6 @@ static inline int pipe_thread_is_self( pipe_thread thread ) return 0; } -#define pipe_mutex_lock(mutex) \ - (void) mtx_lock(&(mutex)) - #define pipe_mutex_unlock(mutex) \ (void) mtx_unlock(&(mutex)) @@ -188,7 +185,7 @@ static inline void pipe_barrier_destroy(pipe_barrier *barrier) static inline void pipe_barrier_wait(pipe_barrier *barrier) { - pipe_mutex_lock(barrier->mutex); + mtx_lock(&barrier->mutex); assert(barrier->waiters < barrier->count); barrier->waiters++; @@ -243,7 +240,7 @@ pipe_semaphore_destroy(pipe_semaphore *sema) static inline void pipe_semaphore_signal(pipe_semaphore *sema) { - pipe_mutex_lock(sema->mutex); + mtx_lock(&sema->mutex); sema->counter++; cnd_signal(&sema->cond); pipe_mutex_unlock(sema->mutex); @@ -253,7 +250,7 @@ pipe_semaphore_signal(pipe_semaphore *sema) static inline void pipe_semaphore_wait(pipe_semaphore *sema) { - pipe_mutex_lock(sema->mutex); + mtx_lock(&sema->mutex); while (sema->counter <= 0) { cnd_wait(&sema->cond, &sema->mutex); } |