OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-18 18:00:07 +00:00
Code Issues Projects Releases Wiki Activity

Event: Updated several log messages to be assertions.

Browse Source
This commit is contained in:
bunnei 2014-06-09 22:46:54 -04:00
parent edaefe9fa6
commit 83a4ad2885
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/hle/kernel/event.cpp
View File

@ -59,10 +59,8 @@ public:
*/ */
Result SetPermanentLock(Handle handle, const bool permanent_locked) { Result SetPermanentLock(Handle handle, const bool permanent_locked) {
Event* evt = g_object_pool.GetFast<Event>(handle); Event* evt = g_object_pool.GetFast<Event>(handle);
if (!evt) { _assert_msg_(KERNEL, (evt != nullptr), "called, but event is nullptr!");
ERROR_LOG(KERNEL, "called with unknown handle=0x%08X", handle);
return -1;
}
evt->permanent_locked = permanent_locked; evt->permanent_locked = permanent_locked;
return 0; return 0;
} }
@ -75,10 +73,8 @@ Result SetPermanentLock(Handle handle, const bool permanent_locked) {
*/ */
Result SetEventLocked(const Handle handle, const bool locked) { Result SetEventLocked(const Handle handle, const bool locked) {
Event* evt = g_object_pool.GetFast<Event>(handle); Event* evt = g_object_pool.GetFast<Event>(handle);
if (!evt) { _assert_msg_(KERNEL, (evt != nullptr), "called, but event is nullptr!");
ERROR_LOG(KERNEL, "called with unknown handle=0x%08X", handle);
return -1;
}
if (!evt->permanent_locked) { if (!evt->permanent_locked) {
evt->locked = locked; evt->locked = locked;
} }
@ -92,10 +88,8 @@ Result SetEventLocked(const Handle handle, const bool locked) {
*/ */
Result SignalEvent(const Handle handle) { Result SignalEvent(const Handle handle) {
Event* evt = g_object_pool.GetFast<Event>(handle); Event* evt = g_object_pool.GetFast<Event>(handle);
if (!evt) { _assert_msg_(KERNEL, (evt != nullptr), "called, but event is nullptr!");
ERROR_LOG(KERNEL, "called with unknown handle=0x%08X", handle);
return -1;
}
// Resume threads waiting for event to signal // Resume threads waiting for event to signal
bool event_caught = false; bool event_caught = false;
for (size_t i = 0; i < evt->waiting_threads.size(); ++i) { for (size_t i = 0; i < evt->waiting_threads.size(); ++i) {
@ -122,10 +116,8 @@ Result SignalEvent(const Handle handle) {
*/ */
Result ClearEvent(Handle handle) { Result ClearEvent(Handle handle) {
Event* evt = g_object_pool.GetFast<Event>(handle); Event* evt = g_object_pool.GetFast<Event>(handle);
if (!evt) { _assert_msg_(KERNEL, (evt != nullptr), "called, but event is nullptr!");
ERROR_LOG(KERNEL, "called with unknown handle=0x%08X", handle);
return -1;
}
if (!evt->permanent_locked) { if (!evt->permanent_locked) {
evt->locked = true; evt->locked = true;
} }