github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-10-31 08:42:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid pool reallocation in BasicJsonDocument's copy assignment

Browse Source
This commit is contained in:
Benoit Blanchon
2021-12-16 14:42:54 +01:00
parent 3166356484
commit e16767af92
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
extras/tests/JsonDocument/BasicJsonDocument.cpp
View File

@@ -89,7 +89,7 @@ TEST_CASE("BasicJsonDocument") {
} }
#endif #endif
SECTION("Copy assign") { SECTION("Copy assign larger") {
{ {
BasicJsonDocument<SpyingAllocator> doc1(4096, log); BasicJsonDocument<SpyingAllocator> doc1(4096, log);
doc1.set(std::string("The size of this string is 32!!")); doc1.set(std::string("The size of this string is 32!!"));
@@ -104,6 +104,36 @@ TEST_CASE("BasicJsonDocument") {
REQUIRE(log.str() == "A4096A8FA4096FF"); REQUIRE(log.str() == "A4096A8FA4096FF");
} }
SECTION("Copy assign smaller") {
{
BasicJsonDocument<SpyingAllocator> doc1(1024, log);
doc1.set(std::string("The size of this string is 32!!"));
BasicJsonDocument<SpyingAllocator> doc2(4096, log);
doc2 = doc1;
REQUIRE(doc1.as<std::string>() == "The size of this string is 32!!");
REQUIRE(doc2.as<std::string>() == "The size of this string is 32!!");
REQUIRE(doc2.capacity() == 1024);
}
REQUIRE(log.str() == "A1024A4096FA1024FF");
}
SECTION("Copy assign same size") {
{
BasicJsonDocument<SpyingAllocator> doc1(1024, log);
doc1.set(std::string("The size of this string is 32!!"));
BasicJsonDocument<SpyingAllocator> doc2(1024, log);
doc2 = doc1;
REQUIRE(doc1.as<std::string>() == "The size of this string is 32!!");
REQUIRE(doc2.as<std::string>() == "The size of this string is 32!!");
REQUIRE(doc2.capacity() == 1024);
}
REQUIRE(log.str() == "A1024A1024FF");
}
#if ARDUINOJSON_HAS_RVALUE_REFERENCES #if ARDUINOJSON_HAS_RVALUE_REFERENCES
SECTION("Move assign") { SECTION("Move assign") {
{ {

3
src/ArduinoJson/Document/BasicJsonDocument.hpp
View File

@@ -139,6 +139,9 @@ class BasicJsonDocument : AllocatorOwner<TAllocator>, public JsonDocument {
} }
void reallocPool(size_t requiredSize) { void reallocPool(size_t requiredSize) {
size_t capa = addPadding(requiredSize);
if (capa == _pool.capacity())
return;
freePool(); freePool();
replacePool(allocPool(addPadding(requiredSize))); replacePool(allocPool(addPadding(requiredSize)));
} }