summaryrefslogtreecommitdiff
path: root/src/util/u_queue.h
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2018-04-24 17:01:35 -0400
committerJuan A. Suarez Romero <jasuarez@igalia.com>2018-04-30 18:42:39 +0200
commit001f7ac65c250532d31ea8d629fda9d8cf0e69c4 (patch)
tree5322a3c8e91d0a91ffbed009456fe4a4ba61a759 /src/util/u_queue.h
parent3e5dfc053763603cfa296d970f4fceb1014f8f75 (diff)
util/u_queue: fix a deadlock in util_queue_finish
Cc: 18.0 18.1 <mesa-stable@lists.freedesktop.org> Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com> (cherry picked from commit 7083ac7290a0c37a45494437a45441112f3cc36c)
Diffstat (limited to 'src/util/u_queue.h')
-rw-r--r--src/util/u_queue.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/util/u_queue.h b/src/util/u_queue.h
index d49f713e6a..d702c4bce8 100644
--- a/src/util/u_queue.h
+++ b/src/util/u_queue.h
@@ -200,6 +200,7 @@ struct util_queue_job {
/* Put this into your context. */
struct util_queue {
const char *name;
+ mtx_t finish_lock; /* only for util_queue_finish */
mtx_t lock;
cnd_t has_queued_cond;
cnd_t has_space_cond;