diff options
author | Liam <byteslice@airmail.cc> | 2023-12-23 22:26:07 +0100 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-12-23 22:26:07 +0100 |
commit | e3491a9ee862e5980c623d4a85cd3dd07e355e59 (patch) | |
tree | d1dd67286d63ffa32041a2db223136ac35113ca3 /src/core/hle/kernel/k_auto_object_container.h | |
parent | Merge pull request #12412 from ameerj/gl-query-prims (diff) | |
download | yuzu-e3491a9ee862e5980c623d4a85cd3dd07e355e59.tar yuzu-e3491a9ee862e5980c623d4a85cd3dd07e355e59.tar.gz yuzu-e3491a9ee862e5980c623d4a85cd3dd07e355e59.tar.bz2 yuzu-e3491a9ee862e5980c623d4a85cd3dd07e355e59.tar.lz yuzu-e3491a9ee862e5980c623d4a85cd3dd07e355e59.tar.xz yuzu-e3491a9ee862e5980c623d4a85cd3dd07e355e59.tar.zst yuzu-e3491a9ee862e5980c623d4a85cd3dd07e355e59.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/k_auto_object_container.h | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/src/core/hle/kernel/k_auto_object_container.h b/src/core/hle/kernel/k_auto_object_container.h index badd75d2a..770743d21 100644 --- a/src/core/hle/kernel/k_auto_object_container.h +++ b/src/core/hle/kernel/k_auto_object_container.h @@ -7,7 +7,7 @@ #include "common/common_funcs.h" #include "core/hle/kernel/k_auto_object.h" -#include "core/hle/kernel/k_light_lock.h" +#include "core/hle/kernel/k_spin_lock.h" namespace Kernel { @@ -21,32 +21,7 @@ public: using ListType = boost::intrusive::rbtree<KAutoObjectWithList>; - class ListAccessor : public KScopedLightLock { - public: - explicit ListAccessor(KAutoObjectWithListContainer* container) - : KScopedLightLock(container->m_lock), m_list(container->m_object_list) {} - explicit ListAccessor(KAutoObjectWithListContainer& container) - : KScopedLightLock(container.m_lock), m_list(container.m_object_list) {} - - typename ListType::iterator begin() const { - return m_list.begin(); - } - - typename ListType::iterator end() const { - return m_list.end(); - } - - typename ListType::iterator find(typename ListType::const_reference ref) const { - return m_list.find(ref); - } - - private: - ListType& m_list; - }; - - friend class ListAccessor; - - KAutoObjectWithListContainer(KernelCore& kernel) : m_lock(kernel), m_object_list() {} + KAutoObjectWithListContainer(KernelCore& kernel) : m_lock(), m_object_list() {} void Initialize() {} void Finalize() {} @@ -56,7 +31,7 @@ public: size_t GetOwnedCount(KProcess* owner); private: - KLightLock m_lock; + KSpinLock m_lock; ListType m_object_list; }; |