diff options
author | Tom Stellard <thomas.stellard@amd.com> | 2015-05-07 13:57:14 +0000 |
---|---|---|
committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-05-20 22:05:46 +0100 |
commit | 5bb7ee4fd605da1d9ca3b4aa2b6a7a28e214e0f6 (patch) | |
tree | bb836594e9257f35591ba342957c58bfccb86b4a | |
parent | 0024b85cc66e2e69e3c374c1f9bc9ef88cb0bf81 (diff) | |
download | mesa-5bb7ee4fd605da1d9ca3b4aa2b6a7a28e214e0f6.tar.gz |
clover: Add a mutex to guard queue::queued_events
This fixes a potential crash where on a sequence like this:
Thread 0: Check if queue is not empty.
Thread 1: Remove item from queue, making it empty.
Thread 0: Do something assuming queue is not empty.
CC: 10.5 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
(cherry picked from commit f546902d9597429713c83e2caf6b69856bd7ba4d)
-rw-r--r-- | src/gallium/state_trackers/clover/core/queue.cpp | 2 | ||||
-rw-r--r-- | src/gallium/state_trackers/clover/core/queue.hpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/clover/core/queue.cpp b/src/gallium/state_trackers/clover/core/queue.cpp index 24f9326662d..87f9dcc6476 100644 --- a/src/gallium/state_trackers/clover/core/queue.cpp +++ b/src/gallium/state_trackers/clover/core/queue.cpp @@ -44,6 +44,7 @@ command_queue::flush() { pipe_screen *screen = device().pipe; pipe_fence_handle *fence = NULL; + std::lock_guard<std::mutex> lock(queued_events_mutex); if (!queued_events.empty()) { pipe->flush(pipe, &fence, 0); @@ -69,6 +70,7 @@ command_queue::profiling_enabled() const { void command_queue::sequence(hard_event &ev) { + std::lock_guard<std::mutex> lock(queued_events_mutex); if (!queued_events.empty()) queued_events.back()().chain(ev); diff --git a/src/gallium/state_trackers/clover/core/queue.hpp b/src/gallium/state_trackers/clover/core/queue.hpp index b7166e685b7..bddb86c0e4c 100644 --- a/src/gallium/state_trackers/clover/core/queue.hpp +++ b/src/gallium/state_trackers/clover/core/queue.hpp @@ -24,6 +24,7 @@ #define CLOVER_CORE_QUEUE_HPP #include <deque> +#include <mutex> #include "core/object.hpp" #include "core/context.hpp" @@ -69,6 +70,7 @@ namespace clover { cl_command_queue_properties props; pipe_context *pipe; + std::mutex queued_events_mutex; std::deque<intrusive_ref<hard_event>> queued_events; }; } |