From 1e0314281a7d2e57b0e0ad2296445dffdb26dbd2 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Sun, 5 Mar 2017 10:41:30 +1100 Subject: [PATCH] gallium/util: replace pipe_condvar_destroy() with cnd_destroy() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit pipe_condvar_destroy() was made unnecessary with fd33a6bcd7f12. Reviewed-by: Emil Velikov Reviewed-by: Marek Olšák --- src/gallium/auxiliary/os/os_thread.h | 7 ++----- src/gallium/auxiliary/util/u_queue.c | 10 +++++----- src/gallium/auxiliary/util/u_ringbuffer.c | 2 +- src/gallium/drivers/llvmpipe/lp_fence.c | 2 +- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/gallium/auxiliary/os/os_thread.h b/src/gallium/auxiliary/os/os_thread.h index e1dc210a6e3..e230d06149e 100644 --- a/src/gallium/auxiliary/os/os_thread.h +++ b/src/gallium/auxiliary/os/os_thread.h @@ -148,9 +148,6 @@ __pipe_mutex_assert_locked(pipe_mutex *mutex) */ typedef cnd_t pipe_condvar; -#define pipe_condvar_destroy(cond) \ - cnd_destroy(&(cond)) - #define pipe_condvar_wait(cond, mutex) \ cnd_wait(&(cond), &(mutex)) @@ -208,7 +205,7 @@ static inline void pipe_barrier_destroy(pipe_barrier *barrier) { assert(barrier->waiters == 0); pipe_mutex_destroy(barrier->mutex); - pipe_condvar_destroy(barrier->condvar); + cnd_destroy(&barrier->condvar); } static inline void pipe_barrier_wait(pipe_barrier *barrier) @@ -261,7 +258,7 @@ static inline void pipe_semaphore_destroy(pipe_semaphore *sema) { pipe_mutex_destroy(sema->mutex); - pipe_condvar_destroy(sema->cond); + cnd_destroy(&sema->cond); } /** Signal/increment semaphore counter */ diff --git a/src/gallium/auxiliary/util/u_queue.c b/src/gallium/auxiliary/util/u_queue.c index dff5b154cac..87f0120d888 100644 --- a/src/gallium/auxiliary/util/u_queue.c +++ b/src/gallium/auxiliary/util/u_queue.c @@ -122,7 +122,7 @@ void util_queue_fence_destroy(struct util_queue_fence *fence) { assert(fence->signalled); - pipe_condvar_destroy(fence->cond); + cnd_destroy(&fence->cond); pipe_mutex_destroy(fence->mutex); } @@ -249,8 +249,8 @@ fail: FREE(queue->threads); if (queue->jobs) { - pipe_condvar_destroy(queue->has_space_cond); - pipe_condvar_destroy(queue->has_queued_cond); + cnd_destroy(&queue->has_space_cond); + cnd_destroy(&queue->has_queued_cond); pipe_mutex_destroy(queue->lock); FREE(queue->jobs); } @@ -281,8 +281,8 @@ util_queue_destroy(struct util_queue *queue) util_queue_killall_and_wait(queue); remove_from_atexit_list(queue); - pipe_condvar_destroy(queue->has_space_cond); - pipe_condvar_destroy(queue->has_queued_cond); + cnd_destroy(&queue->has_space_cond); + cnd_destroy(&queue->has_queued_cond); pipe_mutex_destroy(queue->lock); FREE(queue->jobs); FREE(queue->threads); diff --git a/src/gallium/auxiliary/util/u_ringbuffer.c b/src/gallium/auxiliary/util/u_ringbuffer.c index e3be3ef1fba..334be6a1d47 100644 --- a/src/gallium/auxiliary/util/u_ringbuffer.c +++ b/src/gallium/auxiliary/util/u_ringbuffer.c @@ -47,7 +47,7 @@ fail: void util_ringbuffer_destroy( struct util_ringbuffer *ring ) { - pipe_condvar_destroy(ring->change); + cnd_destroy(&ring->change); pipe_mutex_destroy(ring->mutex); FREE(ring->buf); FREE(ring); diff --git a/src/gallium/drivers/llvmpipe/lp_fence.c b/src/gallium/drivers/llvmpipe/lp_fence.c index 1529981bbe5..3b35eb2e9f2 100644 --- a/src/gallium/drivers/llvmpipe/lp_fence.c +++ b/src/gallium/drivers/llvmpipe/lp_fence.c @@ -73,7 +73,7 @@ lp_fence_destroy(struct lp_fence *fence) debug_printf("%s %d\n", __FUNCTION__, fence->id); pipe_mutex_destroy(fence->mutex); - pipe_condvar_destroy(fence->signalled); + cnd_destroy(&fence->signalled); FREE(fence); } -- 2.30.2