RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-03 12:00:11 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

[orbis-kernel] Fixup evf waiting

Browse source
This commit is contained in:
Ivan Chikish 2023-07-23 04:50:11 +03:00
parent 881e5b8bcc
commit a7d255d401
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
orbis-kernel/src/evf.cpp
View file

@ -131,11 +131,9 @@ std::size_t orbis::EventFlag::notify(NotifyType type, std::uint64_t bits) {
} }
auto resultValue = thread->applyClear(patValue); auto resultValue = thread->applyClear(patValue);
thread->thread->evfResultPattern = patValue;
thread->thread->evfIsCancelled = type == NotifyType::Cancel;
patValue = resultValue; patValue = resultValue;
thread->thread->evfResultPattern = resultValue;
if (type == NotifyType::Cancel) {
thread->thread->evfIsCancelled = 1;
}
// TODO: update thread state // TODO: update thread state
// release wait on waiter thread // release wait on waiter thread

16
orbis-kernel/src/sys/sys_sce.cpp
View file

@ -180,7 +180,7 @@ orbis::SysResult orbis::sys_evf_open(Thread *thread, ptr<const char[32]> name) {
return {}; return {};
} }
orbis::SysResult orbis::sys_evf_close(Thread *thread, sint id) { orbis::SysResult orbis::sys_evf_close(Thread *thread, sint id) {
ORBIS_LOG_WARNING(__FUNCTION__, thread, id); ORBIS_LOG_WARNING(__FUNCTION__, thread->tid, id);
if (!thread->tproc->evfMap.close(id)) { if (!thread->tproc->evfMap.close(id)) {
return ErrorCode::SRCH; return ErrorCode::SRCH;
} }
@ -191,7 +191,7 @@ orbis::SysResult orbis::sys_evf_wait(Thread *thread, sint id,
uint64_t patternSet, uint64_t mode, uint64_t patternSet, uint64_t mode,
ptr<uint64_t> pPatternSet, ptr<uint64_t> pPatternSet,
ptr<uint> pTimeout) { ptr<uint> pTimeout) {
ORBIS_LOG_NOTICE(__FUNCTION__, thread, id, patternSet, mode, pPatternSet, ORBIS_LOG_NOTICE(__FUNCTION__, thread->tid, id, patternSet, mode, pPatternSet,
pTimeout); pTimeout);
if ((mode & (kEvfWaitModeAnd | kEvfWaitModeOr)) == 0 || if ((mode & (kEvfWaitModeAnd | kEvfWaitModeOr)) == 0 ||
(mode & ~(kEvfWaitModeAnd | kEvfWaitModeOr | kEvfWaitModeClearAll | (mode & ~(kEvfWaitModeAnd | kEvfWaitModeOr | kEvfWaitModeClearAll |
@ -210,7 +210,8 @@ orbis::SysResult orbis::sys_evf_wait(Thread *thread, sint id,
auto result = evf->wait(thread, mode, patternSet, auto result = evf->wait(thread, mode, patternSet,
pTimeout != nullptr ? &resultTimeout : nullptr); pTimeout != nullptr ? &resultTimeout : nullptr);
ORBIS_LOG_NOTICE("sys_evf_wait wakeup", thread, thread->evfResultPattern); ORBIS_LOG_NOTICE("sys_evf_wait wakeup", thread->tid,
thread->evfResultPattern);
if (pPatternSet != nullptr) { if (pPatternSet != nullptr) {
uwrite(pPatternSet, thread->evfResultPattern); uwrite(pPatternSet, thread->evfResultPattern);
@ -226,7 +227,8 @@ orbis::SysResult orbis::sys_evf_wait(Thread *thread, sint id,
orbis::SysResult orbis::sys_evf_trywait(Thread *thread, sint id, orbis::SysResult orbis::sys_evf_trywait(Thread *thread, sint id,
uint64_t patternSet, uint64_t mode, uint64_t patternSet, uint64_t mode,
ptr<uint64_t> pPatternSet) { ptr<uint64_t> pPatternSet) {
ORBIS_LOG_NOTICE(__FUNCTION__, thread, id, patternSet, mode, pPatternSet); ORBIS_LOG_NOTICE(__FUNCTION__, thread->tid, id, patternSet, mode,
pPatternSet);
if ((mode & (kEvfWaitModeAnd | kEvfWaitModeOr)) == 0 || if ((mode & (kEvfWaitModeAnd | kEvfWaitModeOr)) == 0 ||
(mode & ~(kEvfWaitModeAnd | kEvfWaitModeOr | kEvfWaitModeClearAll | (mode & ~(kEvfWaitModeAnd | kEvfWaitModeOr | kEvfWaitModeClearAll |
kEvfWaitModeClearPat)) != 0 || kEvfWaitModeClearPat)) != 0 ||
@ -249,7 +251,7 @@ orbis::SysResult orbis::sys_evf_trywait(Thread *thread, sint id,
return result; return result;
} }
orbis::SysResult orbis::sys_evf_set(Thread *thread, sint id, uint64_t value) { orbis::SysResult orbis::sys_evf_set(Thread *thread, sint id, uint64_t value) {
ORBIS_LOG_NOTICE(__FUNCTION__, thread, id, value); ORBIS_LOG_NOTICE(__FUNCTION__, thread->tid, id, value);
Ref<EventFlag> evf = thread->tproc->evfMap.get(id); Ref<EventFlag> evf = thread->tproc->evfMap.get(id);
if (evf == nullptr) { if (evf == nullptr) {
@ -260,7 +262,7 @@ orbis::SysResult orbis::sys_evf_set(Thread *thread, sint id, uint64_t value) {
return {}; return {};
} }
orbis::SysResult orbis::sys_evf_clear(Thread *thread, sint id, uint64_t value) { orbis::SysResult orbis::sys_evf_clear(Thread *thread, sint id, uint64_t value) {
ORBIS_LOG_NOTICE(__FUNCTION__, thread, id, value); ORBIS_LOG_NOTICE(__FUNCTION__, thread->tid, id, value);
Ref<EventFlag> evf = thread->tproc->evfMap.get(id); Ref<EventFlag> evf = thread->tproc->evfMap.get(id);
if (evf == nullptr) { if (evf == nullptr) {
@ -272,7 +274,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, orbis::SysResult orbis::sys_evf_cancel(Thread *thread, sint id, uint64_t value,
ptr<sint> pNumWaitThreads) { ptr<sint> pNumWaitThreads) {
ORBIS_LOG_NOTICE(__FUNCTION__, thread, id, value, pNumWaitThreads); ORBIS_LOG_NOTICE(__FUNCTION__, thread->tid, id, value, pNumWaitThreads);
Ref<EventFlag> evf = thread->tproc->evfMap.get(id); Ref<EventFlag> evf = thread->tproc->evfMap.get(id);
if (evf == nullptr) { if (evf == nullptr) {