OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KConditionVariable/KAddressArbiter: no need for global compare thread

Browse Source
This commit is contained in:
Michael Scire
2020-12-01 16:19:39 -08:00
parent 4f00303daf
commit 25e1d34017
6 changed files with 124 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/libmesosphere/include/mesosphere/kern_k_condition_variable.hpp
View File

@@ -20,8 +20,6 @@
namespace ams::kern {
extern KThread g_cv_arbiter_compare_thread;
class KConditionVariable {
public:
using ThreadTree = typename KThread::ConditionVariableThreadTreeType;

18
libraries/libmesosphere/include/mesosphere/kern_k_thread.hpp
View File

@@ -124,7 +124,21 @@ namespace ams::kern {
static_assert(sizeof(SyncObjectBuffer::sync_objects) == sizeof(SyncObjectBuffer::handles));
struct ConditionVariableComparator {
static constexpr ALWAYS_INLINE int Compare(const KThread &lhs, const KThread &rhs) {
struct LightCompareType {
uintptr_t cv_key;
s32 priority;
constexpr ALWAYS_INLINE uintptr_t GetConditionVariableKey() const {
return this->cv_key;
}
constexpr ALWAYS_INLINE s32 GetPriority() const {
return this->priority;
}
};
template<typename T> requires (std::same_as<T, KThread> || std::same_as<T, LightCompareType>)
static constexpr ALWAYS_INLINE int Compare(const T &lhs, const KThread &rhs) {
const uintptr_t l_key = lhs.GetConditionVariableKey();
const uintptr_t r_key = rhs.GetConditionVariableKey();
@@ -139,6 +153,8 @@ namespace ams::kern {
}
}
};
static_assert(ams::util::HasLightCompareType<ConditionVariableComparator>);
static_assert(std::same_as<ams::util::LightCompareType<ConditionVariableComparator, void>, ConditionVariableComparator::LightCompareType>);
private:
static inline std::atomic<u64> s_next_thread_id = 0;
private: