mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-05-23 03:06:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

os: implement waitable management.

Browse source 
This implements waitable management for Events (and
implements Events). It also refactors PM to use new
Event/Waitable semantics, and also adds STS_ASSERT
as a macro for asserting a boolean expression. The
rest of stratosphere has been refactored to use
STS_ASSERT whenever possible.
This commit is contained in:
Michael Scire 2019-09-27 18:04:58 -07:00 • committed by SciresM
parent e07011be32
commit 609a302e16
108 changed files with 2752 additions and 1223 deletions
Download patch file Download diff file Expand all files Collapse all files

52
stratosphere/pm/source/pm_main.cpp
View file

@ -77,37 +77,6 @@ namespace {
constexpr u8 PrivilegedServiceAccessControl[] = {0x80, '*', 0x00, '*'};
constexpr size_t ProcessCountMax = 0x40;
/* TODO: Libstratosphere this stuff during fatal/creport rewrite. */
enum class DebugEventType : u32 {
AttachProcess = 0,
AttachThread = 1,
ExitProcess = 2,
ExitThread = 3,
Exception = 4
};
struct AttachProcessInfo {
sts::ncm::TitleId title_id;
u64 process_id;
char name[0xC];
u32 flags;
u64 user_exception_context_address; /* 5.0.0+ */
};
union DebugInfo {
AttachProcessInfo attach_process;
};
struct DebugEventInfo {
DebugEventType type;
u32 flags;
u64 thread_id;
union {
DebugInfo info;
u64 _[0x40/sizeof(u64)];
};
};
/* This uses debugging SVCs to retrieve a process's title id. */
sts::ncm::TitleId GetProcessTitleId(u64 process_id) {
/* Check if we should return our title id. */
@ -118,24 +87,19 @@ namespace {
if (current_process_id == process_id) {
return __stratosphere_title_id;
}
/* Get a debug handle. */
AutoHandle debug_handle;
if (R_FAILED(svcDebugActiveProcess(debug_handle.GetPointer(), process_id))) {
/* If we fail to debug a process other than our own, abort. */
std::abort();
}
sts::os::ManagedHandle debug_handle;
R_ASSERT(svcDebugActiveProcess(debug_handle.GetPointer(), process_id));
/* Loop until we get the event that tells us about the process. */
DebugEventInfo d;
while (R_SUCCEEDED(svcGetDebugEvent(reinterpret_cast<u8 *>(&d), debug_handle.Get()))) {
if (d.type == DebugEventType::AttachProcess) {
return d.info.attach_process.title_id;
sts::svc::DebugEventInfo d;
while (true) {
R_ASSERT(svcGetDebugEvent(reinterpret_cast<u8 *>(&d), debug_handle.Get()));
if (d.type == sts::svc::DebugEventType::AttachProcess) {
return sts::ncm::TitleId{d.info.attach_process.title_id};
}
}
/* If we somehow didn't get the event, abort. */
std::abort();
}
/* This works around a bug fixed by FS in 4.0.0. */