Mesa (master): gallium/util: replace pipe_condvar_init() with cnd_init()
Timothy Arceri
tarceri at kemper.freedesktop.org
Mon Mar 6 21:35:42 UTC 2017
Module: Mesa
Branch: master
Commit: 3f58242863e03c47e3b37a63c84a965d12047612
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f58242863e03c47e3b37a63c84a965d12047612
Author: Timothy Arceri <tarceri at itsqueeze.com>
Date: Sun Mar 5 10:41:29 2017 +1100
gallium/util: replace pipe_condvar_init() with cnd_init()
pipe_condvar_init() was made unnecessary with fd33a6bcd7f12.
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
---
src/gallium/auxiliary/os/os_thread.h | 7 ++-----
src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c | 2 +-
src/gallium/auxiliary/util/u_queue.c | 6 +++---
src/gallium/auxiliary/util/u_ringbuffer.c | 2 +-
src/gallium/drivers/llvmpipe/lp_fence.c | 2 +-
src/gallium/drivers/rbug/rbug_context.c | 2 +-
src/gallium/state_trackers/nine/nine_queue.c | 4 ++--
src/gallium/state_trackers/nine/nine_state.c | 2 +-
8 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/gallium/auxiliary/os/os_thread.h b/src/gallium/auxiliary/os/os_thread.h
index 0caf955..e1dc210 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_init(cond) \
- cnd_init(&(cond))
-
#define pipe_condvar_destroy(cond) \
cnd_destroy(&(cond))
@@ -204,7 +201,7 @@ static inline void pipe_barrier_init(pipe_barrier *barrier, unsigned count)
barrier->waiters = 0;
barrier->sequence = 0;
pipe_mutex_init(barrier->mutex);
- pipe_condvar_init(barrier->condvar);
+ cnd_init(&barrier->condvar);
}
static inline void pipe_barrier_destroy(pipe_barrier *barrier)
@@ -256,7 +253,7 @@ static inline void
pipe_semaphore_init(pipe_semaphore *sema, int init_val)
{
pipe_mutex_init(sema->mutex);
- pipe_condvar_init(sema->cond);
+ cnd_init(&sema->cond);
sema->counter = init_val;
}
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
index fdbcf9e..541a6d9 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
@@ -350,7 +350,7 @@ pb_slab_create(struct pb_slab_manager *mgr)
buf->slab = slab;
buf->start = i* mgr->bufSize;
buf->mapCount = 0;
- pipe_condvar_init(buf->event);
+ cnd_init(&buf->event);
LIST_ADDTAIL(&buf->head, &slab->freeBuffers);
slab->numFree++;
buf++;
diff --git a/src/gallium/auxiliary/util/u_queue.c b/src/gallium/auxiliary/util/u_queue.c
index 8dd4cb3..dff5b15 100644
--- a/src/gallium/auxiliary/util/u_queue.c
+++ b/src/gallium/auxiliary/util/u_queue.c
@@ -114,7 +114,7 @@ util_queue_fence_init(struct util_queue_fence *fence)
{
memset(fence, 0, sizeof(*fence));
pipe_mutex_init(fence->mutex);
- pipe_condvar_init(fence->cond);
+ cnd_init(&fence->cond);
fence->signalled = true;
}
@@ -213,8 +213,8 @@ util_queue_init(struct util_queue *queue,
pipe_mutex_init(queue->lock);
queue->num_queued = 0;
- pipe_condvar_init(queue->has_queued_cond);
- pipe_condvar_init(queue->has_space_cond);
+ cnd_init(&queue->has_queued_cond);
+ cnd_init(&queue->has_space_cond);
queue->threads = (pipe_thread*)CALLOC(num_threads, sizeof(pipe_thread));
if (!queue->threads)
diff --git a/src/gallium/auxiliary/util/u_ringbuffer.c b/src/gallium/auxiliary/util/u_ringbuffer.c
index 19830a9..e3be3ef 100644
--- a/src/gallium/auxiliary/util/u_ringbuffer.c
+++ b/src/gallium/auxiliary/util/u_ringbuffer.c
@@ -35,7 +35,7 @@ struct util_ringbuffer *util_ringbuffer_create( unsigned dwords )
ring->mask = dwords - 1;
- pipe_condvar_init(ring->change);
+ cnd_init(&ring->change);
pipe_mutex_init(ring->mutex);
return ring;
diff --git a/src/gallium/drivers/llvmpipe/lp_fence.c b/src/gallium/drivers/llvmpipe/lp_fence.c
index a21a3c7..1529981 100644
--- a/src/gallium/drivers/llvmpipe/lp_fence.c
+++ b/src/gallium/drivers/llvmpipe/lp_fence.c
@@ -53,7 +53,7 @@ lp_fence_create(unsigned rank)
pipe_reference_init(&fence->reference, 1);
pipe_mutex_init(fence->mutex);
- pipe_condvar_init(fence->signalled);
+ cnd_init(&fence->signalled);
fence->id = fence_id++;
fence->rank = rank;
diff --git a/src/gallium/drivers/rbug/rbug_context.c b/src/gallium/drivers/rbug/rbug_context.c
index 1dd0f6d..9634f88 100644
--- a/src/gallium/drivers/rbug/rbug_context.c
+++ b/src/gallium/drivers/rbug/rbug_context.c
@@ -1204,7 +1204,7 @@ rbug_context_create(struct pipe_screen *_screen, struct pipe_context *pipe)
return NULL;
pipe_mutex_init(rb_pipe->draw_mutex);
- pipe_condvar_init(rb_pipe->draw_cond);
+ cnd_init(&rb_pipe->draw_cond);
pipe_mutex_init(rb_pipe->call_mutex);
pipe_mutex_init(rb_pipe->list_mutex);
make_empty_list(&rb_pipe->shaders);
diff --git a/src/gallium/state_trackers/nine/nine_queue.c b/src/gallium/state_trackers/nine/nine_queue.c
index 9f0bf8b..004d581 100644
--- a/src/gallium/state_trackers/nine/nine_queue.c
+++ b/src/gallium/state_trackers/nine/nine_queue.c
@@ -240,10 +240,10 @@ nine_queue_create(void)
goto failed;
}
- pipe_condvar_init(ctx->event_pop);
+ cnd_init(&ctx->event_pop);
pipe_mutex_init(ctx->mutex_pop);
- pipe_condvar_init(ctx->event_push);
+ cnd_init(&ctx->event_push);
pipe_mutex_init(ctx->mutex_push);
/* Block until first cmdbuf has been flushed. */
diff --git a/src/gallium/state_trackers/nine/nine_state.c b/src/gallium/state_trackers/nine/nine_state.c
index bdb0ba1..e1a2ff0 100644
--- a/src/gallium/state_trackers/nine/nine_state.c
+++ b/src/gallium/state_trackers/nine/nine_state.c
@@ -151,7 +151,7 @@ nine_csmt_create( struct NineDevice9 *This )
FREE(ctx);
return NULL;
}
- pipe_condvar_init(ctx->event_processed);
+ cnd_init(&ctx->event_processed);
pipe_mutex_init(ctx->mutex_processed);
pipe_mutex_init(ctx->thread_running);
pipe_mutex_init(ctx->thread_resume);
More information about the mesa-commit
mailing list