arangodb
diff --git a/‎arangod/SystemMonitor/AsyncRegistry/CMakeLists.txt
Lines changed: 1 addition & 3 deletions b/‎arangod/SystemMonitor/AsyncRegistry/CMakeLists.txt
Lines changed: 1 addition & 3 deletions
diff --git a/‎arangod/SystemMonitor/AsyncRegistry/RestHandler.cpp
Lines changed: 3 additions & 2 deletions b/‎arangod/SystemMonitor/AsyncRegistry/RestHandler.cpp
Lines changed: 3 additions & 2 deletions
diff --git a/‎arangod/SystemMonitor/AsyncRegistry/Stacktrace/CMakeLists.txt
Lines changed: 0 additions & 6 deletions b/‎arangod/SystemMonitor/AsyncRegistry/Stacktrace/CMakeLists.txt
Lines changed: 0 additions & 6 deletions
diff --git a/‎lib/Containers/CMakeLists.txt
Lines changed: 1 addition & 0 deletions b/‎lib/Containers/CMakeLists.txt
Lines changed: 1 addition & 0 deletions
diff --git a/‎lib/Containers/Forest/CMakeLists.txt
Lines changed: 5 additions & 0 deletions b/‎lib/Containers/Forest/CMakeLists.txt
Lines changed: 5 additions & 0 deletions
diff --git a/‎arangod/SystemMonitor/AsyncRegistry/Stacktrace/depth_first.h renamed to ‎lib/Containers/Forest/depth_first.h
Lines changed: 5 additions & 5 deletions b/‎arangod/SystemMonitor/AsyncRegistry/Stacktrace/depth_first.h renamed to ‎lib/Containers/Forest/depth_first.h
Lines changed: 5 additions & 5 deletions
diff --git a/‎arangod/SystemMonitor/AsyncRegistry/Stacktrace/forest.h renamed to ‎lib/Containers/Forest/forest.h
Lines changed: 6 additions & 7 deletions b/‎arangod/SystemMonitor/AsyncRegistry/Stacktrace/forest.h renamed to ‎lib/Containers/Forest/forest.h
Lines changed: 6 additions & 7 deletions
diff --git a/‎tests/AsyncRegistryServer/CMakeLists.txt
Lines changed: 0 additions & 10 deletions b/‎tests/AsyncRegistryServer/CMakeLists.txt
Lines changed: 0 additions & 10 deletions
diff --git a/‎tests/CMakeLists.txt
Lines changed: 1 addition & 2 deletions b/‎tests/CMakeLists.txt
Lines changed: 1 addition & 2 deletions
diff --git a/‎tests/Containers/CMakeLists.txt
Lines changed: 11 additions & 0 deletions b/‎tests/Containers/CMakeLists.txt
Lines changed: 11 additions & 0 deletions
diff --git a/‎tests/AsyncRegistryServer/StacktraceTest.cpp renamed to ‎tests/Containers/ForestTest.cpp
Lines changed: 6 additions & 6 deletions b/‎tests/AsyncRegistryServer/StacktraceTest.cpp renamed to ‎tests/Containers/ForestTest.cpp
Lines changed: 6 additions & 6 deletions
@@ -3,6 +3,4 @@ target_sources(arangoserver PRIVATE
   Metrics.cpp
   RestHandler.cpp)
 target_link_libraries(arangoserver
-  arango_async_registry_stacktrace)
-
-add_subdirectory(Stacktrace)
+  arango_forest)
@@ -25,8 +25,8 @@
 #include <variant>
 
 #include "Async/Registry/promise.h"
-#include "SystemMonitor/AsyncRegistry/Stacktrace/depth_first.h"
-#include "SystemMonitor/AsyncRegistry/Stacktrace/forest.h"
+#include "Containers/Forest/depth_first.h"
+#include "Containers/Forest/forest.h"
 #include "ApplicationFeatures/ApplicationServer.h"
 #include "Async/Registry/promise.h"
 #include "Async/Registry/registry_variable.h"
@@ -42,6 +42,7 @@
 
 using namespace arangodb;
 using namespace arangodb::async_registry;
+using namespace arangodb::containers;
 
 struct Entry {
   TreeHierarchy hierarchy;
 
@@ -1 +1,2 @@
 add_subdirectory(Concurrent)
+add_subdirectory(Forest)
@@ -0,0 +1,5 @@
+add_library(arango_forest INTERFACE
+  depth_first.h
+  forest.h)
+target_include_directories(arango_forest INTERFACE
+  ${PROJECT_SOURCE_DIR}/lib)
@@ -27,7 +27,7 @@
 #include <stack>
 #include <vector>
 
-namespace arangodb::async_registry {
+namespace arangodb::containers {
 
 using Id = void*;
 using TreeHierarchy = size_t;
@@ -68,9 +68,9 @@ struct DFS_PostOrder {
     return next();
   }
 
-  Forest const& _forest;
-  const Id _start;
-  std::stack<std::tuple<Id, TreeHierarchy, bool>> _stack;
+  Forest const& _forest = {};
+  const Id _start = nullptr;
+  std::stack<std::tuple<Id, TreeHierarchy, bool>> _stack = {};
 };
 
-}  // namespace arangodb::async_registry
+}  // namespace arangodb::containers
@@ -26,7 +26,7 @@
 #include <vector>
 #include <unordered_map>
 
-namespace arangodb::async_registry {
+namespace arangodb::containers {
 
 using Id = void*;
 
@@ -68,11 +68,10 @@ struct Forest {
 
   bool operator==(Forest<Node> const&) const = default;
 
-  std::vector<Id> _parent;  // has one entry for each node
-  std::vector<Node> _node;  // has one entry for each node
-  std::unordered_map<Id, size_t>
-      _position;  // at which position of the vectors _waiter and _data to find
-                  // entries for Id
+  std::vector<Id> _parent = {};  // has one entry for each node
+  std::vector<Node> _node = {};  // has one entry for each node
+  // at which position of the vectors _waiter and _data to find entries for Id
+  std::unordered_map<Id, size_t> _position = {};
 };
 
 /**
@@ -119,4 +118,4 @@ struct IndexedForestWithRoots : IndexedForest<Node> {
   std::vector<Id> _roots;
 };
 
-}  // namespace arangodb::async_registry
+}  // namespace arangodb::containers
@@ -327,8 +327,8 @@ endif()
 
 target_link_libraries(arangodbtests
   arango
-  arango_tests_async_registry_server
   arango_tests_basics
+  arango_tests_forest
   arango_tests_replication2
   arango_tests_replication2_pure
   arango_tests_task_registry
@@ -420,7 +420,6 @@ endforeach()
 
 add_subdirectory(Actor)
 add_subdirectory(Async)
-add_subdirectory(AsyncRegistryServer)
 add_subdirectory(Containers)
 add_subdirectory(sepp)
 add_subdirectory(VocBase/Properties)
 
@@ -1 +1,12 @@
+add_library(arango_tests_forest OBJECT
+  ForestTest.cpp)
+target_link_libraries(arango_tests_forest PRIVATE
+  arango_forest
+  gtest)
+
+add_executable(arangodbtests_forest EXCLUDE_FROM_ALL)
+target_link_libraries(arangodbtests_forest
+  arango_tests_forest
+  gtest_main)
+
 add_subdirectory(Concurrent)
@@ -20,14 +20,14 @@
 ///
 /// @author Julia Volmer
 ////////////////////////////////////////////////////////////////////////////////
-#include "AsyncRegistryServer/Stacktrace/forest.h"
-#include "AsyncRegistryServer/Stacktrace/depth_first.h"
+#include "Containers/Forest/forest.h"
+#include "Containers/Forest/depth_first.h"
 
 #include <gtest/gtest.h>
 
-using namespace arangodb::async_registry;
+using namespace arangodb::containers;
 
-TEST(AsyncRegistryStacktraceTest, insert_nodes_into_forest) {
+TEST(ForestTest, insert_nodes_into_forest) {
   Forest<std::string> forest;
 
   forest.insert((void*)32, (void*)1, "first");
@@ -45,7 +45,7 @@ TEST(AsyncRegistryStacktraceTest, insert_nodes_into_forest) {
   ASSERT_EQ(forest.node((void*)1), std::nullopt);
 }
 
-TEST(AsyncRegistryStacktraceTest, index_forest) {
+TEST(ForestTest, index_forest) {
   Forest<std::string> forest;
   forest.insert((void*)1, (void*)2, "first");
   forest.insert((void*)2, (void*)4, "second");
@@ -66,7 +66,7 @@ TEST(AsyncRegistryStacktraceTest, index_forest) {
   ASSERT_EQ(forest, (Forest<std::string>{{}, {}, {}}));
 }
 
-TEST(AsyncRegistryStacktraceTest, executes_post_ordered_depth_first) {
+TEST(ForestTest, executes_post_ordered_depth_first) {
   Forest<std::string> forest;
   forest.insert((void*)1, (void*)0, "root");
   forest.insert((void*)2, (void*)1, "node");