feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Reduce size of CollectionData::clear()

Browse Source
This commit is contained in:
Benoit Blanchon
2023-07-24 10:24:33 +02:00
parent 228c4cf9fa
commit 2fdacb1ca0
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ArduinoJson/Collection/CollectionData.hpp
View File

@ -110,10 +110,10 @@ class CollectionData {
protected:
iterator addSlot(ResourceManager*);
void releaseSlot(iterator, ResourceManager*);
private:
SlotWithId getPreviousSlot(VariantSlot*, const ResourceManager*) const;
void releaseSlot(SlotWithId, ResourceManager*);
};
inline const VariantData* collectionToVariant(

23
src/ArduinoJson/Collection/CollectionImpl.hpp
View File

@ -64,8 +64,14 @@ inline CollectionData::iterator CollectionData::addSlot(
}
inline void CollectionData::clear(ResourceManager* resources) {
for (auto it = createIterator(resources); !it.done(); it.next(resources))
releaseSlot(it, resources);
auto next = head_;
while (next != NULL_SLOT) {
auto currId = next;
auto slot = resources->getSlot(next);
next = slot->next();
releaseSlot(SlotWithId(slot, currId), resources);
}
head_ = NULL_SLOT;
tail_ = NULL_SLOT;
}
@ -96,7 +102,7 @@ inline void CollectionData::remove(iterator it, ResourceManager* resources) {
head_ = next;
if (next == NULL_SLOT)
tail_ = prev.id();
releaseSlot(it, resources);
releaseSlot({it.slot_, it.currentId_}, resources);
}
inline size_t CollectionData::memoryUsage(
@ -127,13 +133,12 @@ inline size_t CollectionData::size(const ResourceManager* resources) const {
return count;
}
inline void CollectionData::releaseSlot(iterator it,
inline void CollectionData::releaseSlot(SlotWithId slot,
ResourceManager* resources) {
ARDUINOJSON_ASSERT(!it.done());
if (it.ownsKey())
resources->dereferenceString(it.key());
it->setNull(resources);
resources->freeSlot(SlotWithId(it.slot_, it.currentId_));
if (slot->ownsKey())
resources->dereferenceString(slot->key());
slot->data()->setNull(resources);
resources->freeSlot(slot);
}
ARDUINOJSON_END_PRIVATE_NAMESPACE