summaryrefslogtreecommitdiff
path: root/src/core/hle/svc.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2014-12-13 21:16:13 -0200
committerGravatar Yuri Kunde Schlesner2014-12-28 11:52:52 -0200
commit73fba22c019562687c6e14f20ca7422020f7e070 (patch)
tree605504e9e6306752023ce8bfbff9599c2eab957e /src/core/hle/svc.cpp
parentMerge pull request #349 from lioncash/uhdync (diff)
downloadyuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.gz
yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.xz
yuzu-73fba22c019562687c6e14f20ca7422020f7e070.zip
Rename ObjectPool to HandleTable
Diffstat (limited to 'src/core/hle/svc.cpp')
-rw-r--r--src/core/hle/svc.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index c98168e51..a48ac09a3 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -92,7 +92,7 @@ static Result ConnectToPort(Handle* out, const char* port_name) {
92 92
93/// Synchronize to an OS service 93/// Synchronize to an OS service
94static Result SendSyncRequest(Handle handle) { 94static Result SendSyncRequest(Handle handle) {
95 Kernel::Session* session = Kernel::g_object_pool.Get<Kernel::Session>(handle); 95 Kernel::Session* session = Kernel::g_handle_table.Get<Kernel::Session>(handle);
96 if (session == nullptr) { 96 if (session == nullptr) {
97 return InvalidHandle(ErrorModule::Kernel).raw; 97 return InvalidHandle(ErrorModule::Kernel).raw;
98 } 98 }
@@ -119,10 +119,10 @@ static Result WaitSynchronization1(Handle handle, s64 nano_seconds) {
119 // TODO(bunnei): Do something with nano_seconds, currently ignoring this 119 // TODO(bunnei): Do something with nano_seconds, currently ignoring this
120 bool wait_infinite = (nano_seconds == -1); // Used to wait until a thread has terminated 120 bool wait_infinite = (nano_seconds == -1); // Used to wait until a thread has terminated
121 121
122 if (!Kernel::g_object_pool.IsValid(handle)) { 122 if (!Kernel::g_handle_table.IsValid(handle)) {
123 return InvalidHandle(ErrorModule::Kernel).raw; 123 return InvalidHandle(ErrorModule::Kernel).raw;
124 } 124 }
125 Kernel::Object* object = Kernel::g_object_pool.GetFast<Kernel::Object>(handle); 125 Kernel::Object* object = Kernel::g_handle_table.GetFast<Kernel::Object>(handle);
126 _dbg_assert_(Kernel, object != nullptr); 126 _dbg_assert_(Kernel, object != nullptr);
127 127
128 LOG_TRACE(Kernel_SVC, "called handle=0x%08X(%s:%s), nanoseconds=%lld", handle, object->GetTypeName().c_str(), 128 LOG_TRACE(Kernel_SVC, "called handle=0x%08X(%s:%s), nanoseconds=%lld", handle, object->GetTypeName().c_str(),
@@ -150,10 +150,10 @@ static Result WaitSynchronizationN(s32* out, Handle* handles, s32 handle_count,
150 150
151 // Iterate through each handle, synchronize kernel object 151 // Iterate through each handle, synchronize kernel object
152 for (s32 i = 0; i < handle_count; i++) { 152 for (s32 i = 0; i < handle_count; i++) {
153 if (!Kernel::g_object_pool.IsValid(handles[i])) { 153 if (!Kernel::g_handle_table.IsValid(handles[i])) {
154 return InvalidHandle(ErrorModule::Kernel).raw; 154 return InvalidHandle(ErrorModule::Kernel).raw;
155 } 155 }
156 Kernel::Object* object = Kernel::g_object_pool.GetFast<Kernel::Object>(handles[i]); 156 Kernel::Object* object = Kernel::g_handle_table.GetFast<Kernel::Object>(handles[i]);
157 157
158 LOG_TRACE(Kernel_SVC, "\thandle[%d] = 0x%08X(%s:%s)", i, handles[i], object->GetTypeName().c_str(), 158 LOG_TRACE(Kernel_SVC, "\thandle[%d] = 0x%08X(%s:%s)", i, handles[i], object->GetTypeName().c_str(),
159 object->GetName().c_str()); 159 object->GetName().c_str());