diff options
| author |  Sebastian Valle | 2017-01-05 12:55:01 -0500 |
|---|---|---|
| committer |  GitHub | 2017-01-05 12:55:01 -0500 |
| commit | f20d872643654c574f73a263f032613046900f07 (patch) | |
| tree | 021284c18034d053c81928fa19d2efb6658451fb /src/core/hle/kernel/event.cpp | |
| parent | Merge pull request #2407 from jroweboy/nightly-deploy (diff) | |
| parent | Kernel: Add some asserts to enforce the invariants in the scheduler. (diff) | |
| download | yuzu-f20d872643654c574f73a263f032613046900f07.tar.gz yuzu-f20d872643654c574f73a263f032613046900f07.tar.xz yuzu-f20d872643654c574f73a263f032613046900f07.zip | |
Merge pull request #2393 from Subv/synch
Kernel: Mutex priority inheritance and synchronization improvements.
Diffstat (limited to 'src/core/hle/kernel/event.cpp')
| -rw-r--r-- | src/core/hle/kernel/event.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp index 3e116e3df..e1f42af05 100644 --- a/src/core/hle/kernel/event.cpp +++ b/src/core/hle/kernel/event.cpp | |||
| @@ -30,12 +30,12 @@ SharedPtr<Event> Event::Create(ResetType reset_type, std::string name) { | |||
| 30 | return evt; | 30 | return evt; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | bool Event::ShouldWait() { | 33 | bool Event::ShouldWait(Thread* thread) const { |
| 34 | return !signaled; | 34 | return !signaled; |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | void Event::Acquire() { | 37 | void Event::Acquire(Thread* thread) { |
| 38 | ASSERT_MSG(!ShouldWait(), "object unavailable!"); | 38 | ASSERT_MSG(!ShouldWait(thread), "object unavailable!"); |
| 39 | 39 | ||
| 40 | // Release the event if it's not sticky... | 40 | // Release the event if it's not sticky... |
| 41 | if (reset_type != ResetType::Sticky) | 41 | if (reset_type != ResetType::Sticky) |