[Pick][0.8 to 0.9] | FIX: objcachev2 should not use spinlock for create or erase | simple_dom: respect the size of text, and make parsers exception-safe. (#951) | Fix ASAN access stack after vstack destructed (#949)

common/objectcachev2.h

@@ -38,7 +38,7 @@ class ObjectCacheV2 {
         const K key;
         std::shared_ptr<V> ref;
         // prevent create multiple time when borrow
-        photon::spinlock createlock;
+        photon::mutex createlock{0};
         // create timestamp, for cool-down of borrow
         uint64_t lastcreate = 0;
         // reclaim timestamp
@@ -83,7 +83,7 @@ class ObjectCacheV2 {
     };
 
     // protect object cache map
-    photon::spinlock maplock;
+    photon::mutex maplock{0};
     // protect lru list
     std::unordered_set<Box, BoxHash, BoxEqual> map;
     intrusive_list<Box> lru_list;

ecosystem/CMakeLists.txt

@@ -29,6 +29,7 @@ FetchContent_Declare(
     URL ${PHOTON_RAPIDXML_SOURCE}
     URL_HASH
         SHA256=c3f0b886374981bb20fabcf323d755db4be6dba42064599481da64a85f5b3571
+    PATCH_COMMAND git apply ${CMAKE_CURRENT_SOURCE_DIR}/patches/rapidxml.patch
     UPDATE_DISCONNECTED 1)
 FetchContent_MakeAvailable(rapidxml)
 message(STATUS "Rapidxml source dir: ${rapidxml_SOURCE_DIR}")

ecosystem/patches/rapidjson.patch

@@ -9,7 +9,7 @@ index 19f8849b..618492a4 100644
 +    kParseBoolsAsStringFlag = 512,  //!< Parse all booleans (true/false) as strings.
      kParseDefaultFlags = RAPIDJSON_PARSE_DEFAULT_FLAGS  //!< Default parse flags. Can be customized by defining RAPIDJSON_PARSE_DEFAULT_FLAGS
  };
- 
+
 @@ -201,6 +202,8 @@ struct BaseReaderHandler {
      bool Default() { return true; }
      bool Null() { return static_cast<Override&>(*this).Default(); }
@@ -22,7 +22,7 @@ index 19f8849b..618492a4 100644
 @@ -714,13 +717,22 @@ private:
              RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell());
      }
- 
+
 +    template<unsigned parseFlags, typename InputStream, typename Handler>
 +    void ParseRawBools(InputStream& is, Handler& handler) {
 +
@@ -33,7 +33,7 @@ index 19f8849b..618492a4 100644
          RAPIDJSON_ASSERT(is.Peek() == 't');
 +        auto begin = is.PutBegin();
          is.Take();
- 
+
          if (RAPIDJSON_LIKELY(Consume(is, 'r') && Consume(is, 'u') && Consume(is, 'e'))) {
 -            if (RAPIDJSON_UNLIKELY(!handler.Bool(true)))
 +            auto copy = !(parseFlags & kParseInsituFlag);
@@ -49,7 +49,7 @@ index 19f8849b..618492a4 100644
          RAPIDJSON_ASSERT(is.Peek() == 'f');
 +        auto begin = is.PutBegin();
          is.Take();
- 
+
          if (RAPIDJSON_LIKELY(Consume(is, 'a') && Consume(is, 'l') && Consume(is, 's') && Consume(is, 'e'))) {
 -            if (RAPIDJSON_UNLIKELY(!handler.Bool(false)))
 +            auto copy = !(parseFlags & kParseInsituFlag);
@@ -59,3 +59,18 @@ index 19f8849b..618492a4 100644
                  RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
          }
          else
+diff --git a/include/rapidjson/stream.h b/include/rapidjson/stream.h
+index fef82c25..cd51ccd3 100644
+--- a/include/rapidjson/stream.h
++++ b/include/rapidjson/stream.h
+@@ -147,8 +147,8 @@ struct GenericInsituStringStream {
+     GenericInsituStringStream(Ch *src) : src_(src), dst_(0), head_(src) {}
+
+     // Read
+-    Ch Peek() { return *src_; }
+-    Ch Take() { return *src_++; }
++    Ch Peek() { return *src_ ? *src_ : '}'; }
++    Ch Take() { return *src_ ? *src_++ : '}'; }
+     size_t Tell() { return static_cast<size_t>(src_ - head_); }
+
+     // Write

ecosystem/patches/rapidxml.patch

@@ -0,0 +1,11 @@
+--- rapidxml.hpp
++++ rapidxml.hpp
+@@ -2205,6 +2205,8 @@
+                         }
+                         // Skip remaining whitespace after node name
+                         skip<whitespace_pred, Flags>(text);
++                        if (*text == Ch('\0'))
++                            return; // treat it as '>' without increament of text
+                         if (*text != Ch('>'))
+                             RAPIDXML_PARSE_ERROR("expected >", text);
+                         ++text;     // Skip '>'

ecosystem/simple_dom.cpp

@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <vector>
 #include <algorithm>
+#include <memory>
 #include <photon/common/alog.h>
 #include <photon/common/alog-stdstring.h>
 #include <photon/common/utility.h>
@@ -181,11 +182,13 @@ struct JHandler : public BaseReaderHandler<UTF8<>, JHandler> {
         _root = new JNode(text, text_ownership);
     }
     ~JHandler() {
+        delete _root;
+    }
+    JNode* get_root() {
         assert(_nodes.size() == 1);
         assert(_nodes.front().size() == 1);
         _root->set_children(std::move(_nodes.front().front()._children));
-    }
-    JNode* get_root() {
+        DEFER(_root = nullptr);
         return _root;
     }
     void emplace_back(const char* s, size_t length, uint8_t type) {
@@ -248,9 +251,18 @@ struct JHandler : public BaseReaderHandler<UTF8<>, JHandler> {
     }
 };
 
+// As some parsers don't support text length, they only support null
+// terminated strings, so we have to convert the last trailer to '\0',
+// while making the parser to treat it as the trailer.
+inline void fix_trail(char* text, size_t size, char trailer) {
+    auto i = estring_view(text, size).rfind(trailer);
+    if (i != estring_view::npos) text[i] = '\0';
+}
+
 static NodeImpl* parse_json(char* text, size_t size, int flags) {
     const auto kFlags = kParseNumbersAsStringsFlag | kParseBoolsAsStringFlag |
              kParseInsituFlag | kParseCommentsFlag | kParseTrailingCommasFlag;
+    fix_trail(text, size, '}');
     JHandler h(text, flags & DOC_FREE_TEXT_ON_DESTRUCTION);
     using Encoding = UTF8<>;
     GenericInsituStringStream<Encoding> s(text);
@@ -299,12 +311,13 @@ class XMLNode : public DocNode<XMLNode> {
 };
 
 static NodeImpl* parse_xml(char* text, size_t size, int flags) {
+    fix_trail(text, size, '>');
     xml_document<char> doc;
     doc.parse<0>(text);
-    auto root = new XMLNode(text, flags & DOC_FREE_TEXT_ON_DESTRUCTION);
+    auto root = make_unique<XMLNode>(text, flags & DOC_FREE_TEXT_ON_DESTRUCTION);
     assert(root);
     root->build(&doc);
-    return root;
+    return root.release();
 }
 
 class YAMLNode : public DocNode<YAMLNode> {
@@ -330,10 +343,10 @@ class YAMLNode : public DocNode<YAMLNode> {
 
 static NodeImpl* parse_yaml(char* text, size_t size, int flags) {
     auto yaml = ryml::parse_in_place({text, size});
-    auto root = new YAMLNode(text, flags & DOC_FREE_TEXT_ON_DESTRUCTION);
+    auto root = make_unique<YAMLNode>(text, flags & DOC_FREE_TEXT_ON_DESTRUCTION);
     assert(root);
     root->build(yaml.rootref());
-    return root;
+    return root.release();
 }
 
 class IniNode : public DocNode<IniNode> {
@@ -394,24 +407,24 @@ static NodeImpl* parse_ini(char* text, size_t size, int flags) {
     sort(ctx.begin(), ctx.end());
     vector<IniNode> sections, nodes;
     estring_view prev_sect;
-    auto root = new IniNode(text, flags & DOC_FREE_TEXT_ON_DESTRUCTION);
+    auto root = make_unique<IniNode>(text, flags & DOC_FREE_TEXT_ON_DESTRUCTION);
     for (auto& x : ctx) {
         if (prev_sect != x.section) {
             prev_sect  = x.section;
             if (!nodes.empty() && !sections.empty()) {
                 sections.back().set_children(std::move(nodes));
                 assert(nodes.empty());
             }
-            sections.emplace_back(x.section, str{}, root);
+            sections.emplace_back(x.section, str{}, root.get());
         }
-        nodes.emplace_back(x.key, x.val, root);
+        nodes.emplace_back(x.key, x.val, root.get());
     }
     if (!sections.empty()) {
         if (!nodes.empty())
             sections.back().set_children(std::move(nodes));
         root->set_children(std::move(sections));
     }
-    return root;
+    return root.release();
 }
 
 Node parse(char* text, size_t size, int flags) {
@@ -425,7 +438,9 @@ Node parse(char* text, size_t size, int flags) {
         if (flags & DOC_FREE_TEXT_IF_PARSING_FAILED) free(text);
         LOG_ERROR_RETURN(EINVAL, nullptr, "invalid document type ", HEX(i));
     }
-    auto r = parsers[i](text, size, flags);
+    NodeImpl* r = nullptr;
+    try { r = parsers[i](text, size, flags); }
+    catch(...) { LOG_ERROR("parsing failed and exception caught"); }
     if (!r && (flags & DOC_FREE_TEXT_IF_PARSING_FAILED)) free(text);
     return r;
 }

ecosystem/simple_dom.h

@@ -99,6 +99,11 @@ class Node {
     double to_double(double def_val = NAN) const {
         return value().to_double(def_val);
     }
+    bool to_bool() const {
+        assert(type() == TYPE::BOOLEAN);
+        auto v = value();
+        return v.size() && (v[0] == 't' || v[0] == 'T');
+    }
     using TYPE = NodeImpl::TYPE;
 
     bool operator==(str rhs) const { return value() == rhs; }

ecosystem/test/test_simple_dom.cpp

@@ -30,7 +30,7 @@ using namespace std;
 using namespace photon::SimpleDOM;
 
 // OSS list response
-const static char xml[] = R"(
+static char xml[] = R"(
 <?xml version="1.0" encoding="UTF-8"?>
 <ListBucketResult category = "flowers">
   <Name>examplebucket</Name>
@@ -89,7 +89,7 @@ void print_all2(Node node) {
 
 static __attribute__((noinline))
 int do_list_object(string_view prefix, ObjectList& result, string* marker) {
-    auto doc = parse_copy(xml, sizeof(xml), DOC_XML);
+    auto doc = parse(xml, sizeof(xml)-1, DOC_XML);
     EXPECT_TRUE(doc);
     auto list_bucket_result = doc["ListBucketResult"];
     auto attr = list_bucket_result.get_attributes();
@@ -190,7 +190,7 @@ void expect_types(Node node, const std::pair<const char*, uint8_t> (&truth)[N])
 }
 
 TEST(simple_dom, json) {
-    const static char json0[] = R"({
+    static char json0[] = R"({
         "hello": "world",
         "t": true ,
         "f": false,
@@ -199,7 +199,7 @@ TEST(simple_dom, json) {
         "pi": 3.1416,
         "a": [1, 2, 3, 4],
     })";
-    auto doc = parse_copy(json0, sizeof(json0), DOC_JSON);
+    auto doc = parse(json0, sizeof(json0)-1, DOC_JSON);
     EXPECT_TRUE(doc);
     expect_eq_kvs(doc, {
         {"hello",   "world"},
@@ -220,7 +220,7 @@ TEST(simple_dom, json) {
 
 TEST(simple_dom, yaml0) {
     static char yaml0[] = "{foo: 1, bar: [2, 3], john: doe}";
-    auto doc = parse(yaml0, sizeof(yaml0), DOC_YAML);
+    auto doc = parse(yaml0, sizeof(yaml0)-1, DOC_YAML);
     EXPECT_TRUE(doc);
     expect_eq_kvs(doc, {{"foo", "1"}, {"john", "doe"}});
     expect_eq_vals(doc["bar"], {"2", "3"});
@@ -245,7 +245,7 @@ newmap: {}
 newmap (serialized): {}
 I am something: indeed
 )";
-    auto doc = parse(yaml1, sizeof(yaml1), DOC_YAML);
+    auto doc = parse(yaml1, sizeof(yaml1)-1, DOC_YAML);
     EXPECT_TRUE(doc);
     expect_eq_kvs(doc, {
         {"foo",         "says who"},
@@ -259,7 +259,7 @@ I am something: indeed
         "oh so nice", "oh so nice (serialized)"});
 }
 
-const static char example_ini[] = R"(
+static char example_ini[] = R"(
 [protocol]               ; Protocol configuration
 version=6                ; IPv6
 
@@ -306,7 +306,7 @@ funny4 : two : colons
 )";
 
 TEST(simple_dom, ini) {
-    auto doc = parse_copy(example_ini, sizeof(example_ini) - 1, DOC_INI);
+    auto doc = parse(example_ini, sizeof(example_ini)-1, DOC_INI);
     EXPECT_TRUE(doc);
     EXPECT_EQ(doc.num_children(), 6);
     expect_eq_kvs(doc["protocol"], {

thread/thread.cpp

@@ -199,7 +199,7 @@ namespace photon
             uint64_t rwlock_mark;
             void* retval;
         };
-        char* buf;
+        char* buf = nullptr;
         char* stackful_alloc_top;
         size_t stack_size;
 // offset 96B
@@ -295,7 +295,9 @@ namespace photon
 
 #if defined(__has_feature)
 #   if __has_feature(address_sanitizer) // for clang
-#       define __SANITIZE_ADDRESS__ // GCC already sets this
+#       ifndef __SANITIZE_ADDRESS__
+#           define __SANITIZE_ADDRESS__ // GCC already sets this
+#       endif
 #   endif
 #endif
 
@@ -988,9 +990,14 @@ R"(
             func = (uint64_t)&spinlock_unlock;
             arg = &lock;
         }
+        auto ref = sw.to->stack.pointer_ref();
         ASAN_DIE_SWITCH(sw.to);
+<<<<<<< HEAD
         _photon_switch_context_defer_die(
             arg, func, sw.to->stack.pointer_ref());
+=======
+        _photon_switch_context_defer_die(arg, func, ref);
+>>>>>>> b6598e9 (Fix ASAN access stack after vstack destructed (#949))
         __builtin_unreachable();
     }