diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2015-05-09 16:22:33 +0300 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-05-20 22:06:26 +0100 |
| commit | b4045dd5e9bbe3c29a8926ac66a42baf3d7cac9a (patch) | |
| tree | 527abd6dd58f84d90482764b5df9e5dc730d93eb | |
| parent | f25af5317f7acb29503df8685c501af0daa2b8a1 (diff) | |
clover: Wrap event::_status in a method to prevent unlocked access.
Tested-by: Tom Stellard <thomas.stellard@amd.com>
CC: 10.5 <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 4022a468b2976c65e0d2afe9c9ac5804729e8641)
| -rw-r--r-- | src/gallium/state_trackers/clover/core/event.cpp | 15 | ||||
| -rw-r--r-- | src/gallium/state_trackers/clover/core/event.hpp | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/gallium/state_trackers/clover/core/event.cpp b/src/gallium/state_trackers/clover/core/event.cpp index d03e0b42ba3..969d19a54ae 100644 --- a/src/gallium/state_trackers/clover/core/event.cpp +++ b/src/gallium/state_trackers/clover/core/event.cpp @@ -27,7 +27,7 @@ using namespace clover; event::event(clover::context &ctx, const ref_vector<event> &deps, action action_ok, action action_fail) : - context(ctx), _status(0), wait_count(1), + context(ctx), wait_count(1), _status(0), action_ok(action_ok), action_fail(action_fail) { for (auto &ev : deps) ev.chain(*this); @@ -84,6 +84,11 @@ event::signalled() const { return !wait_count; } +cl_int +event::status() const { + return _status; +} + void event::chain(event &ev) { if (wait_count) { @@ -122,8 +127,8 @@ cl_int hard_event::status() const { pipe_screen *screen = queue()->device().pipe; - if (_status < 0) - return _status; + if (event::status() < 0) + return event::status(); else if (!_fence) return CL_QUEUED; @@ -213,8 +218,8 @@ soft_event::soft_event(clover::context &ctx, const ref_vector<event> &deps, cl_int soft_event::status() const { - if (_status < 0) - return _status; + if (event::status() < 0) + return event::status(); else if (!signalled() || any_of([](const event &ev) { diff --git a/src/gallium/state_trackers/clover/core/event.hpp b/src/gallium/state_trackers/clover/core/event.hpp index 32acb2d1bca..837d63cb12d 100644 --- a/src/gallium/state_trackers/clover/core/event.hpp +++ b/src/gallium/state_trackers/clover/core/event.hpp @@ -66,7 +66,7 @@ namespace clover { void abort(cl_int status); bool signalled() const; - virtual cl_int status() const = 0; + virtual cl_int status() const; virtual command_queue *queue() const = 0; virtual cl_command_type command() const = 0; virtual void wait() const; @@ -76,7 +76,6 @@ namespace clover { protected: void chain(event &ev); - cl_int _status; std::vector<intrusive_ref<event>> deps; private: @@ -84,6 +83,7 @@ namespace clover { std::vector<intrusive_ref<event>> abort_self(cl_int status); unsigned wait_count; + cl_int _status; action action_ok; action action_fail; std::vector<intrusive_ref<event>> _chain; |