Module: Mesa Branch: master Commit: a533d4edf1ea346dd9e343c71b2cd500fa550ef8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a533d4edf1ea346dd9e343c71b2cd500fa550ef8
Author: Francisco Jerez <[email protected]> Date: Sat May 9 16:01:23 2015 +0300 clover: Implement locking of the wait_count, _chain and _status members of event. Tested-by: Tom Stellard <[email protected]> CC: 10.5 <[email protected]> --- src/gallium/state_trackers/clover/core/event.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/gallium/state_trackers/clover/core/event.cpp b/src/gallium/state_trackers/clover/core/event.cpp index 969d19a..e1f9de0 100644 --- a/src/gallium/state_trackers/clover/core/event.cpp +++ b/src/gallium/state_trackers/clover/core/event.cpp @@ -38,6 +38,7 @@ event::~event() { std::vector<intrusive_ref<event>> event::trigger_self() { + std::lock_guard<std::mutex> lock(mutex); std::vector<intrusive_ref<event>> evs; if (!--wait_count) @@ -61,6 +62,7 @@ event::trigger() { std::vector<intrusive_ref<event>> event::abort_self(cl_int status) { + std::lock_guard<std::mutex> lock(mutex); std::vector<intrusive_ref<event>> evs; _status = status; @@ -81,16 +83,22 @@ event::abort(cl_int status) { bool event::signalled() const { + std::lock_guard<std::mutex> lock(mutex); return !wait_count; } cl_int event::status() const { + std::lock_guard<std::mutex> lock(mutex); return _status; } void event::chain(event &ev) { + std::unique_lock<std::mutex> lock(mutex, std::defer_lock); + std::unique_lock<std::mutex> lock_ev(ev.mutex, std::defer_lock); + std::lock(lock, lock_ev); + if (wait_count) { ev.wait_count++; _chain.push_back(ev); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
