mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-09 16:19:09 +01:00
Merge pull request #8040 from Morph1984/handle-table
KHandleTable: Optimize table entry layout
This commit is contained in:
commit
5960d54722
2 changed files with 12 additions and 30 deletions
|
@ -63,7 +63,7 @@ bool KHandleTable::Remove(Handle handle) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode KHandleTable::Add(Handle* out_handle, KAutoObject* obj, u16 type) {
|
ResultCode KHandleTable::Add(Handle* out_handle, KAutoObject* obj) {
|
||||||
KScopedDisableDispatch dd(kernel);
|
KScopedDisableDispatch dd(kernel);
|
||||||
KScopedSpinLock lk(m_lock);
|
KScopedSpinLock lk(m_lock);
|
||||||
|
|
||||||
|
@ -75,7 +75,7 @@ ResultCode KHandleTable::Add(Handle* out_handle, KAutoObject* obj, u16 type) {
|
||||||
const auto linear_id = this->AllocateLinearId();
|
const auto linear_id = this->AllocateLinearId();
|
||||||
const auto index = this->AllocateEntry();
|
const auto index = this->AllocateEntry();
|
||||||
|
|
||||||
m_entry_infos[index].info = {.linear_id = linear_id, .type = type};
|
m_entry_infos[index].linear_id = linear_id;
|
||||||
m_objects[index] = obj;
|
m_objects[index] = obj;
|
||||||
|
|
||||||
obj->Open();
|
obj->Open();
|
||||||
|
@ -116,7 +116,7 @@ void KHandleTable::Unreserve(Handle handle) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void KHandleTable::Register(Handle handle, KAutoObject* obj, u16 type) {
|
void KHandleTable::Register(Handle handle, KAutoObject* obj) {
|
||||||
KScopedDisableDispatch dd(kernel);
|
KScopedDisableDispatch dd(kernel);
|
||||||
KScopedSpinLock lk(m_lock);
|
KScopedSpinLock lk(m_lock);
|
||||||
|
|
||||||
|
@ -132,7 +132,7 @@ void KHandleTable::Register(Handle handle, KAutoObject* obj, u16 type) {
|
||||||
// Set the entry.
|
// Set the entry.
|
||||||
ASSERT(m_objects[index] == nullptr);
|
ASSERT(m_objects[index] == nullptr);
|
||||||
|
|
||||||
m_entry_infos[index].info = {.linear_id = static_cast<u16>(linear_id), .type = type};
|
m_entry_infos[index].linear_id = static_cast<u16>(linear_id);
|
||||||
m_objects[index] = obj;
|
m_objects[index] = obj;
|
||||||
|
|
||||||
obj->Open();
|
obj->Open();
|
||||||
|
|
|
@ -42,7 +42,7 @@ public:
|
||||||
m_free_head_index = -1;
|
m_free_head_index = -1;
|
||||||
|
|
||||||
// Free all entries.
|
// Free all entries.
|
||||||
for (s32 i = 0; i < static_cast<s32>(m_table_size); ++i) {
|
for (s16 i = 0; i < static_cast<s16>(m_table_size); ++i) {
|
||||||
m_objects[i] = nullptr;
|
m_objects[i] = nullptr;
|
||||||
m_entry_infos[i].next_free_index = i - 1;
|
m_entry_infos[i].next_free_index = i - 1;
|
||||||
m_free_head_index = i;
|
m_free_head_index = i;
|
||||||
|
@ -104,17 +104,8 @@ public:
|
||||||
ResultCode Reserve(Handle* out_handle);
|
ResultCode Reserve(Handle* out_handle);
|
||||||
void Unreserve(Handle handle);
|
void Unreserve(Handle handle);
|
||||||
|
|
||||||
template <typename T>
|
ResultCode Add(Handle* out_handle, KAutoObject* obj);
|
||||||
ResultCode Add(Handle* out_handle, T* obj) {
|
void Register(Handle handle, KAutoObject* obj);
|
||||||
static_assert(std::is_base_of_v<KAutoObject, T>);
|
|
||||||
return this->Add(out_handle, obj, obj->GetTypeObj().GetClassToken());
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
void Register(Handle handle, T* obj) {
|
|
||||||
static_assert(std::is_base_of_v<KAutoObject, T>);
|
|
||||||
return this->Register(handle, obj, obj->GetTypeObj().GetClassToken());
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
bool GetMultipleObjects(T** out, const Handle* handles, size_t num_handles) const {
|
bool GetMultipleObjects(T** out, const Handle* handles, size_t num_handles) const {
|
||||||
|
@ -160,9 +151,6 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
ResultCode Add(Handle* out_handle, KAutoObject* obj, u16 type);
|
|
||||||
void Register(Handle handle, KAutoObject* obj, u16 type);
|
|
||||||
|
|
||||||
s32 AllocateEntry() {
|
s32 AllocateEntry() {
|
||||||
ASSERT(m_count < m_table_size);
|
ASSERT(m_count < m_table_size);
|
||||||
|
|
||||||
|
@ -179,7 +167,7 @@ private:
|
||||||
ASSERT(m_count > 0);
|
ASSERT(m_count > 0);
|
||||||
|
|
||||||
m_objects[index] = nullptr;
|
m_objects[index] = nullptr;
|
||||||
m_entry_infos[index].next_free_index = m_free_head_index;
|
m_entry_infos[index].next_free_index = static_cast<s16>(m_free_head_index);
|
||||||
|
|
||||||
m_free_head_index = index;
|
m_free_head_index = index;
|
||||||
|
|
||||||
|
@ -278,19 +266,13 @@ private:
|
||||||
}
|
}
|
||||||
|
|
||||||
union EntryInfo {
|
union EntryInfo {
|
||||||
struct {
|
u16 linear_id;
|
||||||
u16 linear_id;
|
s16 next_free_index;
|
||||||
u16 type;
|
|
||||||
} info;
|
|
||||||
s32 next_free_index;
|
|
||||||
|
|
||||||
constexpr u16 GetLinearId() const {
|
constexpr u16 GetLinearId() const {
|
||||||
return info.linear_id;
|
return linear_id;
|
||||||
}
|
}
|
||||||
constexpr u16 GetType() const {
|
constexpr s16 GetNextFreeIndex() const {
|
||||||
return info.type;
|
|
||||||
}
|
|
||||||
constexpr s32 GetNextFreeIndex() const {
|
|
||||||
return next_free_index;
|
return next_free_index;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue