summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorGravatar bunnei2021-05-15 22:34:55 -0700
committerGravatar bunnei2021-05-20 21:40:30 -0700
commitc40e7593f5531884ac91add3d8743b9c08e5535f (patch)
tree0d2def92d7e9b9a961a373188edfde1a4c76e313 /src/core/hle/kernel
parentMerge pull request #6320 from Morph1984/get-pid (diff)
downloadyuzu-c40e7593f5531884ac91add3d8743b9c08e5535f.tar.gz
yuzu-c40e7593f5531884ac91add3d8743b9c08e5535f.tar.xz
yuzu-c40e7593f5531884ac91add3d8743b9c08e5535f.zip
Revert "WORKAROUND: temp. disable session resource limits while we work out issues"
This reverts commit fc086f93b2165b5c210cb7dcd6c18ebe17f1fd7b.
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/k_client_port.cpp8
-rw-r--r--src/core/hle/kernel/k_session.cpp2
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 ad01cf67e..4a12dee10 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
59ResultCode KClientPort::CreateSession(KClientSession** out) { 59ResultCode 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 b7ce27a0b..025b8b555 100644
--- a/src/core/hle/kernel/k_session.cpp
+++ b/src/core/hle/kernel/k_session.cpp
@@ -78,7 +78,7 @@ void KSession::OnClientClosed() {
78void KSession::PostDestroy(uintptr_t arg) { 78void 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