forked from bblanchon/ArduinoJson
Remove memoryUsage()
This commit is contained in:
@@ -145,12 +145,6 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
|
||||
return data_ != 0;
|
||||
}
|
||||
|
||||
// Returns the number of bytes occupied by the array.
|
||||
// https://arduinojson.org/v6/api/jsonarray/memoryusage/
|
||||
FORCE_INLINE size_t memoryUsage() const {
|
||||
return data_ ? data_->memoryUsage(resources_) : 0;
|
||||
}
|
||||
|
||||
// Returns the depth (nesting level) of the array.
|
||||
// https://arduinojson.org/v6/api/jsonarray/nesting/
|
||||
FORCE_INLINE size_t nesting() const {
|
||||
|
||||
@@ -66,12 +66,6 @@ class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
|
||||
return data_ != 0;
|
||||
}
|
||||
|
||||
// Returns the number of bytes occupied by the array.
|
||||
// https://arduinojson.org/v6/api/jsonarrayconst/memoryusage/
|
||||
FORCE_INLINE size_t memoryUsage() const {
|
||||
return data_ ? data_->memoryUsage(resources_) : 0;
|
||||
}
|
||||
|
||||
// Returns the depth (nesting level) of the array.
|
||||
// https://arduinojson.org/v6/api/jsonarrayconst/nesting/
|
||||
FORCE_INLINE size_t nesting() const {
|
||||
|
||||
@@ -88,7 +88,6 @@ class CollectionData {
|
||||
return iterator(resources->getSlot(head_), head_);
|
||||
}
|
||||
|
||||
size_t memoryUsage(const ResourceManager*) const;
|
||||
size_t size(const ResourceManager*) const;
|
||||
size_t nesting(const ResourceManager*) const;
|
||||
|
||||
|
||||
@@ -105,17 +105,6 @@ inline void CollectionData::remove(iterator it, ResourceManager* resources) {
|
||||
releaseSlot({it.slot_, it.currentId_}, resources);
|
||||
}
|
||||
|
||||
inline size_t CollectionData::memoryUsage(
|
||||
const ResourceManager* resources) const {
|
||||
size_t total = 0;
|
||||
for (auto it = createIterator(resources); !it.done(); it.next(resources)) {
|
||||
total += sizeof(VariantSlot) + it->memoryUsage(resources);
|
||||
if (it.ownsKey())
|
||||
total += sizeofString(strlen(it.key()));
|
||||
}
|
||||
return total;
|
||||
}
|
||||
|
||||
inline size_t CollectionData::nesting(const ResourceManager* resources) const {
|
||||
size_t maxChildNesting = 0;
|
||||
for (auto it = createIterator(resources); !it.done(); it.next(resources)) {
|
||||
|
||||
@@ -128,12 +128,6 @@ class JsonDocument : public detail::VariantOperators<const JsonDocument&> {
|
||||
return getSlot().isNull();
|
||||
}
|
||||
|
||||
// Returns the number of used bytes in the memory pool.
|
||||
// https://arduinojson.org/v6/api/jsondocument/memoryusage/
|
||||
size_t memoryUsage() const {
|
||||
return resources_.size();
|
||||
}
|
||||
|
||||
// Returns trues if the memory pool was too small.
|
||||
// https://arduinojson.org/v6/api/jsondocument/overflowed/
|
||||
bool overflowed() const {
|
||||
|
||||
@@ -53,12 +53,6 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
|
||||
return data_ != 0;
|
||||
}
|
||||
|
||||
// Returns the number of bytes occupied by the object.
|
||||
// https://arduinojson.org/v6/api/jsonobject/memoryusage/
|
||||
FORCE_INLINE size_t memoryUsage() const {
|
||||
return data_ ? data_->memoryUsage(resources_) : 0;
|
||||
}
|
||||
|
||||
// Returns the depth (nesting level) of the object.
|
||||
// https://arduinojson.org/v6/api/jsonobject/nesting/
|
||||
FORCE_INLINE size_t nesting() const {
|
||||
|
||||
@@ -42,12 +42,6 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
|
||||
return data_ != 0;
|
||||
}
|
||||
|
||||
// Returns the number of bytes occupied by the object.
|
||||
// https://arduinojson.org/v6/api/jsonobjectconst/memoryusage/
|
||||
FORCE_INLINE size_t memoryUsage() const {
|
||||
return data_ ? data_->memoryUsage(resources_) : 0;
|
||||
}
|
||||
|
||||
// Returns the depth (nesting level) of the object.
|
||||
// https://arduinojson.org/v6/api/jsonobjectconst/nesting/
|
||||
FORCE_INLINE size_t nesting() const {
|
||||
|
||||
@@ -47,12 +47,6 @@ class JsonVariantConst : public detail::VariantTag,
|
||||
return !data_;
|
||||
}
|
||||
|
||||
// Returns the number of bytes occupied by the value.
|
||||
// https://arduinojson.org/v6/api/jsonvariantconst/memoryusage/
|
||||
FORCE_INLINE size_t memoryUsage() const {
|
||||
return data_ ? data_->memoryUsage(resources_) : 0;
|
||||
}
|
||||
|
||||
// Returns the depth (nesting level) of the value.
|
||||
// https://arduinojson.org/v6/api/jsonvariantconst/nesting/
|
||||
FORCE_INLINE size_t nesting() const {
|
||||
|
||||
@@ -274,19 +274,6 @@ class VariantData {
|
||||
return type() == VALUE_IS_LINKED_STRING || type() == VALUE_IS_OWNED_STRING;
|
||||
}
|
||||
|
||||
size_t memoryUsage(const ResourceManager* resources) const {
|
||||
switch (type()) {
|
||||
case VALUE_IS_OWNED_STRING:
|
||||
case VALUE_IS_RAW_STRING:
|
||||
return sizeofString(content_.asOwnedString->length);
|
||||
case VALUE_IS_OBJECT:
|
||||
case VALUE_IS_ARRAY:
|
||||
return content_.asCollection.memoryUsage(resources);
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
size_t nesting(const ResourceManager* resources) const {
|
||||
auto collection = asCollection();
|
||||
if (collection)
|
||||
|
||||
@@ -130,13 +130,6 @@ class VariantRefBase : public VariantTag {
|
||||
return VariantData::size(getData(), getResourceManager());
|
||||
}
|
||||
|
||||
// Returns the number of bytes occupied by the value.
|
||||
// https://arduinojson.org/v6/api/jsonvariant/memoryusage/
|
||||
FORCE_INLINE size_t memoryUsage() const {
|
||||
VariantData* data = getData();
|
||||
return data ? data->memoryUsage(getResourceManager()) : 0;
|
||||
}
|
||||
|
||||
// Returns the depth (nesting level) of the value.
|
||||
// https://arduinojson.org/v6/api/jsonvariant/nesting/
|
||||
FORCE_INLINE size_t nesting() const {
|
||||
|
||||
Reference in New Issue
Block a user