diff options
| author | 2021-05-11 10:51:39 -0700 | |
|---|---|---|
| committer | 2021-05-11 10:51:39 -0700 | |
| commit | fc086f93b2165b5c210cb7dcd6c18ebe17f1fd7b (patch) | |
| tree | 19ced76b68881f6f9a6fd250d5e2e73aa53ebdb0 /src/core/hle/kernel | |
| parent | WORKAROUND: Do not use slab heap while we track down issues with resource man... (diff) | |
| download | yuzu-fc086f93b2165b5c210cb7dcd6c18ebe17f1fd7b.tar.gz yuzu-fc086f93b2165b5c210cb7dcd6c18ebe17f1fd7b.tar.xz yuzu-fc086f93b2165b5c210cb7dcd6c18ebe17f1fd7b.zip | |
WORKAROUND: temp. disable session resource limits while we work out issues
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/k_client_port.cpp | 8 | ||||
| -rw-r--r-- | src/core/hle/kernel/k_session.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/k_client_port.cpp b/src/core/hle/kernel/k_client_port.cpp index 4a12dee10..ad01cf67e 100644 --- a/src/core/hle/kernel/k_client_port.cpp +++ b/src/core/hle/kernel/k_client_port.cpp | |||
| @@ -58,9 +58,9 @@ bool KClientPort::IsSignaled() const { | |||
| 58 | 58 | ||
| 59 | ResultCode KClientPort::CreateSession(KClientSession** out) { | 59 | ResultCode KClientPort::CreateSession(KClientSession** out) { |
| 60 | // Reserve a new session from the resource limit. | 60 | // Reserve a new session from the resource limit. |
| 61 | KScopedResourceReservation session_reservation(kernel.CurrentProcess()->GetResourceLimit(), | 61 | // KScopedResourceReservation session_reservation(kernel.CurrentProcess()->GetResourceLimit(), |
| 62 | LimitableResource::Sessions); | 62 | // LimitableResource::Sessions); |
| 63 | R_UNLESS(session_reservation.Succeeded(), ResultLimitReached); | 63 | // R_UNLESS(session_reservation.Succeeded(), ResultLimitReached); |
| 64 | 64 | ||
| 65 | // Update the session counts. | 65 | // Update the session counts. |
| 66 | { | 66 | { |
| @@ -104,7 +104,7 @@ ResultCode KClientPort::CreateSession(KClientSession** out) { | |||
| 104 | session->Initialize(this, parent->GetName()); | 104 | session->Initialize(this, parent->GetName()); |
| 105 | 105 | ||
| 106 | // Commit the session reservation. | 106 | // Commit the session reservation. |
| 107 | session_reservation.Commit(); | 107 | // session_reservation.Commit(); |
| 108 | 108 | ||
| 109 | // Register the session. | 109 | // Register the session. |
| 110 | KSession::Register(kernel, session); | 110 | KSession::Register(kernel, session); |
diff --git a/src/core/hle/kernel/k_session.cpp b/src/core/hle/kernel/k_session.cpp index 025b8b555..b7ce27a0b 100644 --- a/src/core/hle/kernel/k_session.cpp +++ b/src/core/hle/kernel/k_session.cpp | |||
| @@ -78,7 +78,7 @@ void KSession::OnClientClosed() { | |||
| 78 | void KSession::PostDestroy(uintptr_t arg) { | 78 | void KSession::PostDestroy(uintptr_t arg) { |
| 79 | // Release the session count resource the owner process holds. | 79 | // Release the session count resource the owner process holds. |
| 80 | KProcess* owner = reinterpret_cast<KProcess*>(arg); | 80 | KProcess* owner = reinterpret_cast<KProcess*>(arg); |
| 81 | owner->GetResourceLimit()->Release(LimitableResource::Sessions, 1); | 81 | // owner->GetResourceLimit()->Release(LimitableResource::Sessions, 1); |
| 82 | owner->Close(); | 82 | owner->Close(); |
| 83 | } | 83 | } |
| 84 | 84 | ||