OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PM: Fix remaining issues, now works properly again.

Browse Source
This commit is contained in:
Michael Scire
2018-06-15 00:47:07 -06:00
parent 4d36697080
commit f41b780c0a
8 changed files with 78 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
stratosphere/pm/source/pm_process_wait.hpp
View File

@@ -4,23 +4,19 @@
class ProcessWaiter final : public IWaitable {
public:
Registration::Process process;
std::shared_ptr<Registration::Process> process;
ProcessWaiter(Registration::Process p) : process(p) {
ProcessWaiter(std::shared_ptr<Registration::Process> p) : process(p) {
/* ... */
}
ProcessWaiter(Registration::Process *p) {
this->process = *p;
}
Registration::Process *get_process() {
return &this->process;
std::shared_ptr<Registration::Process> get_process() {
return this->process;
}
/* IWaitable */
Handle get_handle() override {
return this->process.handle;
return this->process->handle;
}
void handle_deferred() override {
@@ -28,16 +24,16 @@ class ProcessWaiter final : public IWaitable {
}
Result handle_signaled(u64 timeout) override {
Registration::HandleSignaledProcess(this->get_process());
return 0;
return Registration::HandleSignaledProcess(this->get_process());
}
};
class ProcessList final : public IWaitable {
class ProcessList final {
private:
HosRecursiveMutex mutex;
WaitableManager *manager;
public:
std::vector<ProcessWaiter *> process_waiters;
std::vector<std::shared_ptr<Registration::Process>> processes;
void Lock() {
this->mutex.Lock();
@@ -51,20 +47,12 @@ class ProcessList final : public IWaitable {
return this->mutex.TryLock();
}
/* IWaitable */
Handle get_handle() override {
/* TODO: Panic, because we don't have a handle. */
return 0;
void set_manager(WaitableManager *manager) {
this->manager = manager;
}
void handle_deferred() override {
/* TODO: Panic, because we can never be deferred. */
}
Result handle_signaled(u64 timeout) override {
/* TODO: Panic, because we can never be signaled. */
return 0;
WaitableManager *get_manager() {
return this->manager;
}
};