commit ef411f64bb78e907e39b47d7989a32491960e317
author Aleksei.Glushko <aleksei.glushko@jetbrains.com> Mon Apr 15 18:02:19 2024 +0200
committer Aleksei.Glushko <aleksei.glushko@jetbrains.com> Fri Apr 19 14:20:12 2024 +0200
tree 18536144bfe1778795b322ae5fb70fc936aec2cc
parent 231b35942b3400ae6f34f51b76c7370dc6bf19eb

wip: no stable ref fast deletion

kotlin-native/runtime/src/mm/cpp/SpecialRefRegistry.hpp

diff --git a/kotlin-native/runtime/src/mm/cpp/SpecialRefRegistry.hpp b/kotlin-native/runtime/src/mm/cpp/SpecialRefRegistry.hpp
index 5ce5530..98eb184 100644
--- a/kotlin-native/runtime/src/mm/cpp/SpecialRefRegistry.hpp
+++ b/kotlin-native/runtime/src/mm/cpp/SpecialRefRegistry.hpp
@@ -61,27 +61,14 @@
         inline static constexpr Rc disposedMarker = std::numeric_limits<Rc>::min();
         static_assert(disposedMarker < 0, "disposedMarker must be an impossible Rc value");
 
-        Node(ObjHeader* obj, Rc rc) noexcept : obj_(obj), rc_(rc) {
+        Node(SpecialRefRegistry& registry, ObjHeader* obj, Rc rc) noexcept : obj_(obj), rc_(rc) {
             RuntimeAssert(obj != nullptr, "Creating StableRef for null object");
             RuntimeAssert(rc >= 0, "Creating StableRef with negative rc %d", rc);
             // Runtime tests occasionally use sentinel values under 8 for opaque objects
             RuntimeAssert(reinterpret_cast<uintptr_t>(obj) < 8u || !obj->local(), "Creating StableRef to a stack-allocated object %p", obj);
 
             if (rc > 0) {
-                // TODO:
-                // is everything here OK?
-
-                // Regular publishing happens before the global root scanning,
-                // so this insertion will definitely be processed.
-                // Publishing during the thread destruction is a bit more complicated.
-                // But the GC makes sure to process all threads before scanning global
-                // roots. So, it'll either publish the dying thread itself, or
-                // if the dying thread has already deregistered, it means it published
-                // itself. In any case, global root scanning happens afterwards.
-                // TODO: With CMS root-set-write barrier for marking `node.obj_` should be here.
-                // TODO: No barrier that uses mm::ThreadData can be placed here.
-
-                SpecialRefRegistry::instance().insertIntoRootsHead(*this);
+                registry.insertIntoRootsHead(*this);
             }
         }
 
@@ -221,7 +208,7 @@
 
         [[nodiscard("must be manually disposed")]] Node& registerNode(ObjHeader* obj, Node::Rc rc, bool allowFastDeletion) noexcept {
             RuntimeAssert(obj != nullptr, "Creating node for null object");
-            queue_.emplace_back(obj, rc);
+            queue_.emplace_back(owner_, obj, rc);
             auto& node = queue_.back();
             return node;
         }

kotlin-native/runtime/src/mm/cpp/SpecialRefRegistryTest.cpp

diff --git a/kotlin-native/runtime/src/mm/cpp/SpecialRefRegistryTest.cpp b/kotlin-native/runtime/src/mm/cpp/SpecialRefRegistryTest.cpp
index 16b0f14..8f733ef 100644
--- a/kotlin-native/runtime/src/mm/cpp/SpecialRefRegistryTest.cpp
+++ b/kotlin-native/runtime/src/mm/cpp/SpecialRefRegistryTest.cpp
@@ -87,7 +87,7 @@
         ObjHolder holder(obj);
         auto ref = mm::StableRef::create(obj);
 
-        EXPECT_THAT(roots(), testing::UnorderedElementsAre());
+        EXPECT_THAT(roots(), testing::UnorderedElementsAre(obj));
         EXPECT_THAT(all(), testing::UnorderedElementsAre());
         EXPECT_THAT(*ref, obj);
 
@@ -109,7 +109,7 @@
         ObjHolder holder(obj);
         auto ref = mm::StableRef::create(obj);
 
-        EXPECT_THAT(roots(), testing::UnorderedElementsAre());
+        EXPECT_THAT(roots(), testing::UnorderedElementsAre(obj));
         EXPECT_THAT(all(), testing::UnorderedElementsAre());
         EXPECT_THAT(*ref, obj);
 
@@ -177,7 +177,7 @@
         ObjHolder holder(obj);
         auto ref = mm::ObjCBackRef::create(obj);
 
-        EXPECT_THAT(roots(), testing::UnorderedElementsAre());
+        EXPECT_THAT(roots(), testing::UnorderedElementsAre(obj));
         EXPECT_THAT(all(), testing::UnorderedElementsAre());
         EXPECT_THAT(*ref, obj);
 
@@ -205,7 +205,7 @@
         ObjHolder holder(obj);
         auto ref = mm::ObjCBackRef::create(obj);
 
-        EXPECT_THAT(roots(), testing::UnorderedElementsAre());
+        EXPECT_THAT(roots(), testing::UnorderedElementsAre(obj));
         EXPECT_THAT(all(), testing::UnorderedElementsAre());
         EXPECT_THAT(*ref, obj);
 
@@ -236,7 +236,7 @@
         auto ref2 = mm::WeakRef::create(obj);
         auto ref3 = mm::ObjCBackRef::create(obj);
 
-        EXPECT_THAT(roots(), testing::UnorderedElementsAre());
+        EXPECT_THAT(roots(), testing::UnorderedElementsAre(obj, obj));
         EXPECT_THAT(all(), testing::UnorderedElementsAre());
 
         std::move(ref1).dispose();
@@ -262,7 +262,7 @@
         auto ref2 = mm::WeakRef::create(obj);
         auto ref3 = mm::ObjCBackRef::create(obj);
 
-        EXPECT_THAT(roots(), testing::UnorderedElementsAre());
+        EXPECT_THAT(roots(), testing::UnorderedElementsAre(obj, obj));
         EXPECT_THAT(all(), testing::UnorderedElementsAre());
 
         publish();