diff options
| -rw-r--r-- | src/gallium/auxiliary/os/os_thread.h | 5 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_queue.c | 4 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_ringbuffer.c | 4 | ||||
| -rw-r--r-- | src/gallium/state_trackers/nine/nine_queue.c | 4 | ||||
| -rw-r--r-- | src/gallium/state_trackers/nine/nine_state.c | 4 |
5 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 6895f4e97f4..a8b5d926342 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_signal(cond) \ - cnd_signal(&(cond)) - #define pipe_condvar_broadcast(cond) \ cnd_broadcast(&(cond)) @@ -264,7 +261,7 @@ pipe_semaphore_signal(pipe_semaphore *sema) { pipe_mutex_lock(sema->mutex); sema->counter++; - pipe_condvar_signal(sema->cond); + cnd_signal(&sema->cond); pipe_mutex_unlock(sema->mutex); } diff --git a/src/gallium/auxiliary/util/u_queue.c b/src/gallium/auxiliary/util/u_queue.c index 8fc2f3b3bb2..3cef7d200ba 100644 --- a/src/gallium/auxiliary/util/u_queue.c +++ b/src/gallium/auxiliary/util/u_queue.c @@ -168,7 +168,7 @@ static PIPE_THREAD_ROUTINE(util_queue_thread_func, input) queue->read_idx = (queue->read_idx + 1) % queue->max_jobs; queue->num_queued--; - pipe_condvar_signal(queue->has_space_cond); + cnd_signal(&queue->has_space_cond); pipe_mutex_unlock(queue->lock); if (job.job) { @@ -316,7 +316,7 @@ util_queue_add_job(struct util_queue *queue, queue->write_idx = (queue->write_idx + 1) % queue->max_jobs; queue->num_queued++; - pipe_condvar_signal(queue->has_queued_cond); + cnd_signal(&queue->has_queued_cond); pipe_mutex_unlock(queue->lock); } diff --git a/src/gallium/auxiliary/util/u_ringbuffer.c b/src/gallium/auxiliary/util/u_ringbuffer.c index adba9ead773..a97236fe54c 100644 --- a/src/gallium/auxiliary/util/u_ringbuffer.c +++ b/src/gallium/auxiliary/util/u_ringbuffer.c @@ -102,7 +102,7 @@ void util_ringbuffer_enqueue( struct util_ringbuffer *ring, /* Signal change: */ - pipe_condvar_signal(ring->change); + cnd_signal(&ring->change); pipe_mutex_unlock(ring->mutex); } @@ -154,7 +154,7 @@ enum pipe_error util_ringbuffer_dequeue( struct util_ringbuffer *ring, out: /* Signal change: */ - pipe_condvar_signal(ring->change); + cnd_signal(&ring->change); pipe_mutex_unlock(ring->mutex); return ret; } diff --git a/src/gallium/state_trackers/nine/nine_queue.c b/src/gallium/state_trackers/nine/nine_queue.c index fdfbdbb2472..b50b57bc90f 100644 --- a/src/gallium/state_trackers/nine/nine_queue.c +++ b/src/gallium/state_trackers/nine/nine_queue.c @@ -114,7 +114,7 @@ nine_queue_get(struct nine_queue_pool* ctx) pipe_mutex_lock(ctx->mutex_pop); DBG("freeing cmdbuf=%p\n", cmdbuf); cmdbuf->full = 0; - pipe_condvar_signal(ctx->event_pop); + cnd_signal(&ctx->event_pop); pipe_mutex_unlock(ctx->mutex_pop); ctx->tail = (ctx->tail + 1) & NINE_CMD_BUFS_MASK; @@ -150,7 +150,7 @@ nine_queue_flush(struct nine_queue_pool* ctx) /* signal waiting worker */ pipe_mutex_lock(ctx->mutex_push); cmdbuf->full = 1; - pipe_condvar_signal(ctx->event_push); + cnd_signal(&ctx->event_push); pipe_mutex_unlock(ctx->mutex_push); ctx->head = (ctx->head + 1) & NINE_CMD_BUFS_MASK; diff --git a/src/gallium/state_trackers/nine/nine_state.c b/src/gallium/state_trackers/nine/nine_state.c index 0a2a0b9c792..90c49cf8f88 100644 --- a/src/gallium/state_trackers/nine/nine_state.c +++ b/src/gallium/state_trackers/nine/nine_state.c @@ -108,7 +108,7 @@ PIPE_THREAD_ROUTINE(nine_csmt_worker, arg) if (instr->func(ctx->device, instr)) { pipe_mutex_lock(ctx->mutex_processed); p_atomic_set(&ctx->processed, TRUE); - pipe_condvar_signal(ctx->event_processed); + cnd_signal(&ctx->event_processed); pipe_mutex_unlock(ctx->mutex_processed); } if (p_atomic_read(&ctx->toPause)) { @@ -124,7 +124,7 @@ PIPE_THREAD_ROUTINE(nine_csmt_worker, arg) if (p_atomic_read(&ctx->terminate)) { pipe_mutex_lock(ctx->mutex_processed); p_atomic_set(&ctx->processed, TRUE); - pipe_condvar_signal(ctx->event_processed); + cnd_signal(&ctx->event_processed); pipe_mutex_unlock(ctx->mutex_processed); break; } |