mika/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-07-14 21:12:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Addressed remaining comments

Browse Source
This commit is contained in:
Adubbz 2020-02-26 02:21:21 +11:00
parent 78fe75acf4
commit 74b06bdb50
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
stratosphere/ncm/source/impl/lr_registered_data.hpp
View File

@ -34,6 +34,24 @@ namespace ams::lr::impl {
private: private:
Entry entries[NumEntries]; Entry entries[NumEntries];
size_t capacity; size_t capacity;
private:
inline bool IsExcluded(const ncm::ProgramId id, const ncm::ProgramId* excluding_ids, size_t num_ids) const {
for (size_t i = 0; i < num_ids; i++) {
if (id == excluding_ids[i]) {
return true;
}
}
return false;
}
inline void RegisterImpl(size_t i, const Key &key, const Value &value, const ncm::ProgramId owner_id) {
Entry& entry = this->entries[i];
entry.key = key;
entry.value = value;
entry.owner_id = owner_id;
entry.is_valid = true;
}
public: public:
RegisteredData(size_t capacity = NumEntries) : capacity(capacity) { RegisteredData(size_t capacity = NumEntries) : capacity(capacity) {
this->Clear(); this->Clear();
@ -44,18 +62,16 @@ namespace ams::lr::impl {
for (size_t i = 0; i < this->GetCapacity(); i++) { for (size_t i = 0; i < this->GetCapacity(); i++) {
Entry& entry = this->entries[i]; Entry& entry = this->entries[i];
if (entry.is_valid && entry.key == key) { if (entry.is_valid && entry.key == key) {
entry.value = value; this->RegisterImpl(i, key, value, owner_id);
return true; return true;
} }
} }
/* We didn't find an existing entry, so try to create a new one. */
for (size_t i = 0; i < this->GetCapacity(); i++) { for (size_t i = 0; i < this->GetCapacity(); i++) {
Entry& entry = this->entries[i]; Entry& entry = this->entries[i];
if (!entry.is_valid) { if (!entry.is_valid) {
entry.key = key; this->RegisterImpl(i, key, value, owner_id);
entry.value = value;
entry.owner_id = owner_id;
entry.is_valid = true;
return true; return true;
} }
} }
@ -102,18 +118,8 @@ namespace ams::lr::impl {
void ClearExcluding(const ncm::ProgramId* ids, size_t num_ids) { void ClearExcluding(const ncm::ProgramId* ids, size_t num_ids) {
for (size_t i = 0; i < this->GetCapacity(); i++) { for (size_t i = 0; i < this->GetCapacity(); i++) {
Entry& entry = this->entries[i]; Entry& entry = this->entries[i];
bool found = false;
for (size_t j = 0; j < num_ids; j++) { if (!this->IsExcluded(entry.owner_id, ids, num_ids)) {
ncm::ProgramId id = ids[j];
if (entry.owner_id == id) {
found = true;
break;
}
}
if (!found) {
entry.is_valid = false; entry.is_valid = false;
} }
} }