code refactor + cleanup

Author: 7bitcoder

Source/Library/MemoryManager.cpp

@@ -1,19 +1,16 @@
 #include <setjmp.h>
 
-#include "MemoryManager.hpp"
 #include "DetectOs.hpp"
+#include "MemoryManager.hpp"
 
 #ifdef WINDOWS
-
 #include <windows.h>
 
 #include <processthreadsapi.h>
-
 #endif
-#ifdef LINUX
 
+#ifdef LINUX
 #include <pthread.h>
-
 #endif
 
 namespace sd
@@ -32,7 +29,6 @@ namespace sd
         }
 
 #ifdef WINDOWS
-
         auto getStackBounds()
         {
             auto rsp = getStackRsp();
@@ -43,7 +39,6 @@ namespace sd
         }
 #endif
 #ifdef LINUX
-
         auto getStackBounds()
         {
             auto rsp = getStackRsp();
@@ -83,8 +78,8 @@ namespace sd
 
     void MemoryManager::clear()
     {
-        _register.forEach([this](Object &object) { destroy(object); });
-        _register.clear();
+        _objectRegister.forEach([this](Object &object) { destroy(object); });
+        _objectRegister.clear();
     }
 
     void MemoryManager::destroy(Object &object)
@@ -104,7 +99,7 @@ namespace sd
         {
             auto ptr = worklist.back();
             worklist.pop_back();
-            auto &object = _register.getObject(ptr);
+            auto &object = _objectRegister.getObject(ptr);
 
             if (object.isMarked())
             {
@@ -120,7 +115,7 @@ namespace sd
 
     void MemoryManager::sweep()
     {
-        _register.unregisterIf([this](Object &object) {
+        _objectRegister.unregisterIf([this](Object &object) {
             if (object.isMarked())
             {
                 object.unmark();
@@ -146,7 +141,7 @@ namespace sd
         while (rsp < top)
         {
             auto address = (void *)*reinterpret_cast<void **>(rsp);
-            if (_register.contains(address))
+            if (_objectRegister.contains(address))
             {
                 result.emplace_back(address);
             }
@@ -164,7 +159,7 @@ namespace sd
         while (p < end)
         {
             auto address = (void *)*reinterpret_cast<void **>(p);
-            if (_register.contains(address))
+            if (_objectRegister.contains(address))
             {
                 result.emplace_back(address);
             }

Source/Library/h/MemoryManager.hpp

@@ -53,8 +53,8 @@ namespace sd
             class Metadata
             {
               private:
-                bool _marked;
-                const TypeInfo *_typeInfo;
+                bool _marked = false;
+                const TypeInfo *_typeInfo = nullptr;
 
               public:
                 Metadata(TypeInfo *typeInfo) : _marked(false), _typeInfo(typeInfo) {}
@@ -65,7 +65,7 @@ namespace sd
             };
 
           private:
-            void *_ptr;
+            void *_ptr = nullptr;
             Metadata _metadata;
 
             Object(void *ptr, Metadata metadata) : _ptr(ptr), _metadata(metadata) {}
@@ -76,8 +76,7 @@ namespace sd
 
             template <class T, class... Args> static Object create(Args &&...params)
             {
-                auto ptr = Type<T>::create(std::forward<Args>(params)...);
-                return Object{ptr, {Type<T>::getInfo()}};
+                return Object{Type<T>::create(std::forward<Args>(params)...), {Type<T>::getInfo()}};
             };
 
             void *getRawPtr() const { return _ptr; }
@@ -122,7 +121,7 @@ namespace sd
         };
 #pragma endregion
 
-        ObjectsRegister _register;
+        ObjectsRegister _objectRegister;
 
         size_t _allocatedMemory = 0;
         size_t _memoryLimit = 1 * 1024 * 1024; // ~1MB
@@ -147,7 +146,7 @@ namespace sd
         {
             auto object = Object::create<T>(std::forward<Args>(params)...);
             _allocatedMemory += object.getSize();
-            _register.registerNew(object);
+            _objectRegister.registerNew(object);
             if (isGBCollectionNeeded())
             {
                 garbageCollect();

Tests/MemoryManagerTest.cpp

@@ -121,8 +121,7 @@ TEST_F(MemoryManagerTest, ManagerShouldCollectObjectsWithCircleReferences)
 TEST_F(MemoryManagerTest, ManagerShouldCollectSomeObjects)
 {
     auto circle = make(nullptr);
-    auto circle2 = make(circle);
-    circle->ptr = circle2;
+    circle->ptr = make(circle);
     {
 
         auto toRemove = make(nullptr);
@@ -140,10 +139,24 @@ TEST_F(MemoryManagerTest, ManagerShouldCollectSomeObjects)
 
     sd::MemoryManager::instance().garbageCollect();
 
-    EXPECT_FALSE(wasCollected({circle, circle2}));
+    EXPECT_FALSE(wasCollected({circle, circle->ptr}));
     EXPECT_LE(1, collectedCnt());
 }
 
+TEST_F(MemoryManagerTest, ManagerShouldNotCollectInnerObjects)
+{
+    auto circle = make(nullptr);
+    circle->ptr = make(nullptr);
+    circle->ptr->ptr = make(nullptr);
+    circle->ptr->ptr->ptr = make(nullptr);
+    circle->ptr->ptr->ptr->ptr = make(nullptr);
+
+    sd::MemoryManager::instance().garbageCollect();
+
+    EXPECT_FALSE(
+        wasCollected({circle, circle->ptr, circle->ptr->ptr, circle->ptr->ptr->ptr, circle->ptr->ptr->ptr->ptr}));
+}
+
 TEST_F(MemoryManagerTest, ManagerShouldNotCollectAutomaticallySomeObjects)
 {
     auto limit = 500 * 1024 / sizeof(ExampleClass);