RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2025-12-06 07:12:14 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[orbis-kernel] Implement sys_namedobj_create and sys_namedobj_delete

Browse source
This commit is contained in:
Ivan Chikish 2023-07-08 16:44:05 +03:00
parent 34b27c271c
commit 6f678ef595
4 changed files with 104 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
orbis-kernel/include/orbis/sys/sys_sce.hpp Normal file
View file

@ -0,0 +1,11 @@
#pragma once
namespace orbis {
enum {
kNamedObjTypeMutex = 0x101,
kNamedObjTypeCond = 0x102,
kNamedObjTypeRwlock = 0x103,
kNamedObjTypeBarrier = 0x104,
kNamedObjTypeEqueue = 0x107,
};
}

4
orbis-kernel/include/orbis/sys/sysproto.hpp
View file

@ -641,8 +641,8 @@ SysResult sys_osem_trywait(Thread *thread /* TODO */);
SysResult sys_osem_post(Thread *thread /* TODO */);
SysResult sys_osem_cancel(Thread *thread /* TODO */);
SysResult sys_namedobj_create(Thread *thread, ptr<const char> name,
ptr<void> object, uint64_t type);
SysResult sys_namedobj_delete(Thread *thread /* TODO */);
ptr<void> object, uint16_t type);
SysResult sys_namedobj_delete(Thread *thread, uint16_t id, uint16_t type);
SysResult sys_set_vm_container(Thread *thread /* TODO */);
SysResult sys_debug_init(Thread *thread /* TODO */);
SysResult sys_suspend_process(Thread *thread, pid_t pid);

9
orbis-kernel/include/orbis/thread/Process.hpp
View file

@ -39,5 +39,14 @@ struct Process {
utils::RcIdMap<Module, ModuleHandle> modulesMap;
utils::OwningIdMap<Thread, lwpid_t> threadsMap;
utils::RcIdMap<utils::RcBase, sint> fileDescriptors;
// Named objects for debugging
utils::shared_mutex namedObjMutex;
utils::kmap<void*, utils::kstring> namedObjNames;
utils::OwningIdMap<void*, std::uint16_t, 65535, 1> mutexIds;
utils::OwningIdMap<void*, std::uint16_t, 65535, 1> condIds;
utils::OwningIdMap<void*, std::uint16_t, 65535, 1> rwlockIds;
utils::OwningIdMap<void*, std::uint16_t, 65535, 1> barrierIds;
utils::OwningIdMap<sint, std::uint16_t, 65535, 1> equeueIds;
};
} // namespace orbis

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

@ -4,6 +4,7 @@
#include "module/ModuleInfo.hpp"
#include "module/ModuleInfoEx.hpp"
#include "sys/sysproto.hpp"
#include "sys/sys_sce.hpp"
#include "utils/Logs.hpp"
#include <chrono>
@ -301,13 +302,89 @@ orbis::SysResult orbis::sys_osem_cancel(Thread *thread /* TODO */) {
}
orbis::SysResult orbis::sys_namedobj_create(Thread *thread,
ptr<const char> name,
ptr<void> object, uint64_t type) {
ORBIS_LOG_TODO(__FUNCTION__, name, object, type);
thread->retval[0] = 1;
ptr<void> object, uint16_t type) {
ORBIS_LOG_NOTICE(__FUNCTION__, name, object, type);
utils::kstring str = name;
if (str.size() > 31)
return ErrorCode::NAMETOOLONG;
if (type < 0x101 || type > 0x107)
return ErrorCode::INVAL;
std::lock_guard lock(thread->tproc->namedObjMutex);
if (!thread->tproc->namedObjNames.try_emplace(object, std::move(str)).second) {
ORBIS_LOG_FATAL("Named object: pointer colflict", type, object);
}
switch (type) {
case kNamedObjTypeMutex:
thread->retval[0] = thread->tproc->mutexIds.emplace(object).first;
break;
case kNamedObjTypeCond:
thread->retval[0] = thread->tproc->condIds.emplace(object).first;
break;
case kNamedObjTypeRwlock:
thread->retval[0] = thread->tproc->rwlockIds.emplace(object).first;
break;
case kNamedObjTypeBarrier:
thread->retval[0] = thread->tproc->barrierIds.emplace(object).first;
break;
case kNamedObjTypeEqueue:
thread->retval[0] =
thread->tproc->equeueIds.emplace((std::intptr_t)object).first;
break;
default:
std::abort();
}
return {};
}
orbis::SysResult orbis::sys_namedobj_delete(Thread *thread /* TODO */) {
ORBIS_LOG_TODO(__FUNCTION__);
orbis::SysResult orbis::sys_namedobj_delete(Thread *thread, uint16_t id,
uint16_t type) {
ORBIS_LOG_NOTICE(__FUNCTION__, id, type);
if (id == 0 || type < 0x101 || type > 0x107)
return ErrorCode::INVAL;
std::lock_guard lock(thread->tproc->namedObjMutex);
void *object = nullptr;
switch (type) {
case kNamedObjTypeMutex:
if (auto pobj = thread->tproc->mutexIds.get(id))
object = *pobj, thread->tproc->mutexIds.destroy(id);
else
return ErrorCode::SRCH;
break;
case kNamedObjTypeCond:
if (auto pobj = thread->tproc->condIds.get(id))
object = *pobj, thread->tproc->condIds.destroy(id);
else
return ErrorCode::SRCH;
break;
case kNamedObjTypeRwlock:
if (auto pobj = thread->tproc->rwlockIds.get(id))
object = *pobj, thread->tproc->rwlockIds.destroy(id);
else
return ErrorCode::SRCH;
break;
case kNamedObjTypeBarrier:
if (auto pobj = thread->tproc->barrierIds.get(id))
object = *pobj, thread->tproc->barrierIds.destroy(id);
else
return ErrorCode::SRCH;
break;
case kNamedObjTypeEqueue:
if (auto pobj = thread->tproc->equeueIds.get(id))
object = (void*)*pobj, thread->tproc->equeueIds.destroy(id);
else
return ErrorCode::SRCH;
break;
default:
std::abort();
}
if (!thread->tproc->namedObjNames.erase(object)) {
ORBIS_LOG_ERROR("Named object: pointer not found", type, object);
}
return {};
}
orbis::SysResult orbis::sys_set_vm_container(Thread *thread /* TODO */) {