diff options
| author | 2014-12-13 21:16:13 -0200 | |
|---|---|---|
| committer | 2014-12-28 11:52:52 -0200 | |
| commit | 73fba22c019562687c6e14f20ca7422020f7e070 (patch) | |
| tree | 605504e9e6306752023ce8bfbff9599c2eab957e /src/core/hle/kernel/mutex.cpp | |
| parent | Merge pull request #349 from lioncash/uhdync (diff) | |
| download | yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.gz yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.xz yuzu-73fba22c019562687c6e14f20ca7422020f7e070.zip | |
Rename ObjectPool to HandleTable
Diffstat (limited to 'src/core/hle/kernel/mutex.cpp')
| -rw-r--r-- | src/core/hle/kernel/mutex.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp index 5a18af114..abfe178a0 100644 --- a/src/core/hle/kernel/mutex.cpp +++ b/src/core/hle/kernel/mutex.cpp | |||
| @@ -87,7 +87,7 @@ void ReleaseThreadMutexes(Handle thread) { | |||
| 87 | 87 | ||
| 88 | // Release every mutex that the thread holds, and resume execution on the waiting threads | 88 | // Release every mutex that the thread holds, and resume execution on the waiting threads |
| 89 | for (MutexMap::iterator iter = locked.first; iter != locked.second; ++iter) { | 89 | for (MutexMap::iterator iter = locked.first; iter != locked.second; ++iter) { |
| 90 | Mutex* mutex = g_object_pool.GetFast<Mutex>(iter->second); | 90 | Mutex* mutex = g_handle_table.GetFast<Mutex>(iter->second); |
| 91 | ResumeWaitingThread(mutex); | 91 | ResumeWaitingThread(mutex); |
| 92 | } | 92 | } |
| 93 | 93 | ||
| @@ -115,7 +115,7 @@ bool ReleaseMutex(Mutex* mutex) { | |||
| 115 | * @param handle Handle to mutex to release | 115 | * @param handle Handle to mutex to release |
| 116 | */ | 116 | */ |
| 117 | ResultCode ReleaseMutex(Handle handle) { | 117 | ResultCode ReleaseMutex(Handle handle) { |
| 118 | Mutex* mutex = Kernel::g_object_pool.Get<Mutex>(handle); | 118 | Mutex* mutex = Kernel::g_handle_table.Get<Mutex>(handle); |
| 119 | if (mutex == nullptr) return InvalidHandle(ErrorModule::Kernel); | 119 | if (mutex == nullptr) return InvalidHandle(ErrorModule::Kernel); |
| 120 | 120 | ||
| 121 | if (!ReleaseMutex(mutex)) { | 121 | if (!ReleaseMutex(mutex)) { |
| @@ -136,7 +136,7 @@ ResultCode ReleaseMutex(Handle handle) { | |||
| 136 | */ | 136 | */ |
| 137 | Mutex* CreateMutex(Handle& handle, bool initial_locked, const std::string& name) { | 137 | Mutex* CreateMutex(Handle& handle, bool initial_locked, const std::string& name) { |
| 138 | Mutex* mutex = new Mutex; | 138 | Mutex* mutex = new Mutex; |
| 139 | handle = Kernel::g_object_pool.Create(mutex); | 139 | handle = Kernel::g_handle_table.Create(mutex); |
| 140 | 140 | ||
| 141 | mutex->locked = mutex->initial_locked = initial_locked; | 141 | mutex->locked = mutex->initial_locked = initial_locked; |
| 142 | mutex->name = name; | 142 | mutex->name = name; |