Reduce number of copies of stringEquals()

bblanchon · Jul 10, 2023 · 3a2e02d · 3a2e02d
1 parent e44b3a4
commit 3a2e02d
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 11 deletions.
diff --git a/src/ArduinoJson/Memory/StringPool.hpp b/src/ArduinoJson/Memory/StringPool.hpp
@@ -73,8 +73,24 @@ class StringPool {
     strings_ = node;
   }
 
+  StringNode* get(const char* p, size_t n) const {
+    for (auto node = strings_; node; node = node->next) {
+      if (stringEquals(node->data, node->length, p, n))
+        return node;
+    }
+    return nullptr;
+  }
+
+  template <typename TAdaptedString>
+  typename enable_if<string_traits<TAdaptedString>::has_data, StringNode*>::type
+  get(const TAdaptedString& str) const {
+    return get(str.data(), str.size());
+  }
+
   template <typename TAdaptedString>
-  StringNode* get(const TAdaptedString& str) const {
+  typename enable_if<!string_traits<TAdaptedString>::has_data,
+                     StringNode*>::type
+  get(const TAdaptedString& str) const {
     for (auto node = strings_; node; node = node->next) {
       if (stringEquals(str, adaptString(node->data, node->length)))
         return node;

diff --git a/src/ArduinoJson/Object/ObjectData.hpp b/src/ArduinoJson/Object/ObjectData.hpp
@@ -13,7 +13,14 @@ class ObjectData : public CollectionData {
   VariantData* addMember(StringNode* key, ResourceManager* resources);
 
   template <typename TAdaptedString>
-  VariantData* addMember(TAdaptedString key, ResourceManager* resources);
+  typename enable_if<string_traits<TAdaptedString>::has_data,
+                     VariantData*>::type
+  addMember(TAdaptedString key, ResourceManager* resources);
+
+  template <typename TAdaptedString>
+  typename enable_if<!string_traits<TAdaptedString>::has_data,
+                     VariantData*>::type
+  addMember(TAdaptedString key, ResourceManager* resources);
 
   bool copyFrom(const ObjectData& src, ResourceManager* resources);
 
@@ -63,7 +70,12 @@ class ObjectData : public CollectionData {
 
  private:
   template <typename TAdaptedString>
-  iterator findKey(TAdaptedString key) const;
+  typename enable_if<string_traits<TAdaptedString>::has_data, iterator>::type
+  findKey(TAdaptedString key) const;
+
+  template <typename TAdaptedString>
+  typename enable_if<!string_traits<TAdaptedString>::has_data, iterator>::type
+  findKey(TAdaptedString key) const;
 };
 
 ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/src/ArduinoJson/Object/ObjectImpl.hpp b/src/ArduinoJson/Object/ObjectImpl.hpp
@@ -22,8 +22,9 @@ inline VariantData* ObjectData::addMember(StringNode* key,
 }
 
 template <typename TAdaptedString>
-inline VariantData* ObjectData::addMember(TAdaptedString key,
-                                          ResourceManager* resources) {
+inline typename enable_if<string_traits<TAdaptedString>::has_data,
+                          VariantData*>::type
+ObjectData::addMember(TAdaptedString key, ResourceManager* resources) {
   ARDUINOJSON_ASSERT(!key.isNull());
   auto slot = resources->allocVariant();
   if (!slot)
@@ -40,6 +41,22 @@ inline VariantData* ObjectData::addMember(TAdaptedString key,
   return slot->data();
 }
 
+template <typename TAdaptedString>
+inline typename enable_if<!string_traits<TAdaptedString>::has_data,
+                          VariantData*>::type
+ObjectData::addMember(TAdaptedString key, ResourceManager* resources) {
+  ARDUINOJSON_ASSERT(!key.isNull());
+  auto slot = resources->allocVariant();
+  if (!slot)
+    return nullptr;
+  auto storedKey = resources->saveString(key);
+  if (!storedKey)
+    return nullptr;
+  slot->setKey(storedKey);
+  addSlot(slot);
+  return slot->data();
+}
+
 inline bool ObjectData::copyFrom(const ObjectData& src,
                                  ResourceManager* resources) {
   clear(resources);
@@ -85,7 +102,9 @@ VariantData* ObjectData::getOrAddMember(TAdaptedString key,
 }
 
 template <typename TAdaptedString>
-inline ObjectData::iterator ObjectData::findKey(TAdaptedString key) const {
+inline typename enable_if<!string_traits<TAdaptedString>::has_data,
+                          ObjectData::iterator>::type
+ObjectData::findKey(TAdaptedString key) const {
   if (key.isNull())
     return end();
   for (auto it = begin(); it; ++it) {
@@ -95,6 +114,20 @@ inline ObjectData::iterator ObjectData::findKey(TAdaptedString key) const {
   return end();
 }
 
+template <typename TAdaptedString>
+inline typename enable_if<string_traits<TAdaptedString>::has_data,
+                          ObjectData::iterator>::type
+ObjectData::findKey(TAdaptedString key) const {
+  if (key.isNull())
+    return end();
+  for (auto it = begin(); it; ++it) {
+    auto itKey = it.key();
+    if (stringEquals(itKey.c_str(), itKey.size(), key.data(), key.size()))
+      return it;
+  }
+  return end();
+}
+
 template <typename TAdaptedString>
 inline void ObjectData::removeMember(TAdaptedString key,
                                      ResourceManager* resources) {

diff --git a/src/ArduinoJson/Strings/Adapters/FlashString.hpp b/src/ArduinoJson/Strings/Adapters/FlashString.hpp
@@ -26,10 +26,6 @@ class FlashString {
     return static_cast<char>(pgm_read_byte(str_ + i));
   }
 
-  const char* data() const {
-    return nullptr;
-  }
-
   size_t size() const {
     return size_;
   }

diff --git a/src/ArduinoJson/Strings/StringAdapters.hpp b/src/ArduinoJson/Strings/StringAdapters.hpp
@@ -74,4 +74,14 @@ static void stringGetChars(TAdaptedString s, char* p, size_t n) {
   }
 }
 
+inline bool stringEquals(const char* s1, size_t n1, const char* s2, size_t n2) {
+  if (n1 != n2)
+    return false;
+  for (size_t i = 0; i < n1; i++) {
+    if (s1[i] != s2[i])
+      return false;
+  }
+  return true;
+}
+
 ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/src/ArduinoJson/Variant/VariantData.hpp b/src/ArduinoJson/Variant/VariantData.hpp
@@ -460,7 +460,8 @@ class VariantData {
   }
 
   template <typename TAdaptedString>
-  void setString(TAdaptedString value, ResourceManager* resources) {
+  typename enable_if<string_traits<TAdaptedString>::has_data>::type setString(
+      TAdaptedString value, ResourceManager* resources) {
     setNull(resources);
 
     if (value.isNull())
@@ -476,6 +477,19 @@ class VariantData {
       setOwnedString(dup);
   }
 
+  template <typename TAdaptedString>
+  typename enable_if<!string_traits<TAdaptedString>::has_data>::type setString(
+      TAdaptedString value, ResourceManager* resources) {
+    setNull(resources);
+
+    if (value.isNull())
+      return;
+
+    auto dup = resources->saveString(value);
+    if (dup)
+      setOwnedString(dup);
+  }
+
   template <typename TAdaptedString>
   static void setString(VariantData* var, TAdaptedString value,
                         ResourceManager* resources) {