diff --git a/orbis-kernel/src/sys/sys_sce.cpp b/orbis-kernel/src/sys/sys_sce.cpp index 52de4d62e..eb403c7c1 100644 --- a/orbis-kernel/src/sys/sys_sce.cpp +++ b/orbis-kernel/src/sys/sys_sce.cpp @@ -200,8 +200,8 @@ orbis::SysResult orbis::sys_evf_wait(Thread *thread, sint id, uint64_t patternSet, uint64_t mode, ptr pPatternSet, ptr pTimeout) { - ORBIS_LOG_NOTICE(__FUNCTION__, thread->tid, id, patternSet, mode, pPatternSet, - pTimeout); + ORBIS_LOG_TRACE(__FUNCTION__, thread->tid, id, patternSet, mode, pPatternSet, + pTimeout); if ((mode & (kEvfWaitModeAnd | kEvfWaitModeOr)) == 0 || (mode & ~(kEvfWaitModeAnd | kEvfWaitModeOr | kEvfWaitModeClearAll | kEvfWaitModeClearPat)) != 0 || @@ -219,8 +219,7 @@ orbis::SysResult orbis::sys_evf_wait(Thread *thread, sint id, auto result = evf->wait(thread, mode, patternSet, pTimeout != nullptr ? &resultTimeout : nullptr); - ORBIS_LOG_NOTICE("sys_evf_wait wakeup", thread->tid, - thread->evfResultPattern); + ORBIS_LOG_TRACE("sys_evf_wait wakeup", thread->tid, thread->evfResultPattern); if (pPatternSet != nullptr) { uwrite(pPatternSet, thread->evfResultPattern); @@ -230,14 +229,16 @@ orbis::SysResult orbis::sys_evf_wait(Thread *thread, sint id, uwrite(pTimeout, resultTimeout); } + if (result == ErrorCode::TIMEDOUT) + return SysResult::notAnError(result); + return result; } orbis::SysResult orbis::sys_evf_trywait(Thread *thread, sint id, uint64_t patternSet, uint64_t mode, ptr pPatternSet) { - ORBIS_LOG_NOTICE(__FUNCTION__, thread->tid, id, patternSet, mode, - pPatternSet); + ORBIS_LOG_TRACE(__FUNCTION__, thread->tid, id, patternSet, mode, pPatternSet); if ((mode & (kEvfWaitModeAnd | kEvfWaitModeOr)) == 0 || (mode & ~(kEvfWaitModeAnd | kEvfWaitModeOr | kEvfWaitModeClearAll | kEvfWaitModeClearPat)) != 0 || @@ -263,7 +264,7 @@ orbis::SysResult orbis::sys_evf_trywait(Thread *thread, sint id, return result; } orbis::SysResult orbis::sys_evf_set(Thread *thread, sint id, uint64_t value) { - ORBIS_LOG_NOTICE(__FUNCTION__, thread->tid, id, value); + ORBIS_LOG_TRACE(__FUNCTION__, thread->tid, id, value); Ref evf = thread->tproc->evfMap.get(id); if (evf == nullptr) { @@ -274,7 +275,7 @@ orbis::SysResult orbis::sys_evf_set(Thread *thread, sint id, uint64_t value) { return {}; } orbis::SysResult orbis::sys_evf_clear(Thread *thread, sint id, uint64_t value) { - ORBIS_LOG_NOTICE(__FUNCTION__, thread->tid, id, value); + ORBIS_LOG_TRACE(__FUNCTION__, thread->tid, id, value); Ref evf = thread->tproc->evfMap.get(id); if (evf == nullptr) { @@ -286,7 +287,7 @@ orbis::SysResult orbis::sys_evf_clear(Thread *thread, sint id, uint64_t value) { } orbis::SysResult orbis::sys_evf_cancel(Thread *thread, sint id, uint64_t value, ptr pNumWaitThreads) { - ORBIS_LOG_NOTICE(__FUNCTION__, thread->tid, id, value, pNumWaitThreads); + ORBIS_LOG_TRACE(__FUNCTION__, thread->tid, id, value, pNumWaitThreads); Ref evf = thread->tproc->evfMap.get(id); if (evf == nullptr) {