[iceshard] Introduced a few ProxyAllocators for better tracking.

Dandielo · Dandielo · commit 2861c331ebef · 2025-02-06T22:29:19.000+09:00
diff --git a/source/code/iceshard/iceshard/private/iceshard_trait_context.cxx b/source/code/iceshard/iceshard/private/iceshard_trait_context.cxx
@@ -10,8 +10,8 @@
 namespace ice
 {
 
-    IceshardWorldContext::IceshardWorldContext(ice::Allocator& alloc) noexcept
-        : _allocator{ alloc }
+    IceshardWorldContext::IceshardWorldContext(ice::Allocator& alloc, ice::StringID_Arg worldid) noexcept
+        : _allocator{ alloc, ice::stringid_hint(worldid) }
         , _always_reached_checkpoint{ true }
         , _checkpoints{ alloc }
         , _frame_handlers{ alloc }
diff --git a/source/code/iceshard/iceshard/private/iceshard_trait_context.hxx b/source/code/iceshard/iceshard/private/iceshard_trait_context.hxx
@@ -20,11 +20,11 @@ namespace ice
 
     struct IceshardWorldContext
     {
-        IceshardWorldContext(ice::Allocator& alloc) noexcept;
+        IceshardWorldContext(ice::Allocator& alloc, ice::StringID_Arg worldid) noexcept;
 
         void close_checkpoints() noexcept;
 
-        ice::Allocator& _allocator;
+        ice::ProxyAllocator _allocator;
         ice::TaskCheckpoint _always_reached_checkpoint;
         ice::HashMap<ice::TaskCheckpoint*> _checkpoints;
         ice::HashMap<ice::IceshardEventHandler> _frame_handlers;
diff --git a/source/code/iceshard/iceshard/private/iceshard_world.cxx b/source/code/iceshard/iceshard/private/iceshard_world.cxx
@@ -11,17 +11,17 @@ namespace ice
         ice::Allocator& alloc,
         ice::StringID_Arg worldid,
         ice::ecs::EntityStorage& entity_storage,
-        ice::UniquePtr<ice::IceshardWorldContext> context,
+        ice::IceshardWorldContext& context,
         ice::Array<ice::UniquePtr<ice::IceshardTraitContext>> traits,
         ice::detail::TraitTaskTracker* task_tracker
     ) noexcept
         : worldID{ worldid }
+        , _allocator{ alloc, "world-data" }
         , _entity_storage{ entity_storage }
-        , _entity_operations{ alloc, 16 }
-        , _context{ ice::move(context) }
+        , _entity_operations{ _allocator, 16 }
         , _traits{ ice::move(traits) }
-        , _tasks_launcher{ *_context, ice::array::slice(_traits), task_tracker }
-        , _devui{ create_devui(alloc) }
+        , _tasks_launcher{ context, ice::array::slice(_traits), task_tracker }
+        , _devui{ create_devui(_allocator, context) }
     {
     }
 
@@ -30,8 +30,6 @@ namespace ice
         _entity_storage.execute_operations(_entity_operations, out_shards);
         _entity_operations.clear();
 
-        _context->close_checkpoints();
-
         // Sync trait events
         for (ice::UniquePtr<ice::IceshardTraitContext>& trait : _traits)
         {
diff --git a/source/code/iceshard/iceshard/private/iceshard_world.hxx b/source/code/iceshard/iceshard/private/iceshard_world.hxx
@@ -22,7 +22,7 @@ namespace ice
             ice::Allocator& alloc,
             ice::StringID_Arg worldid,
             ice::ecs::EntityStorage& entity_storage,
-            ice::UniquePtr<ice::IceshardWorldContext> context,
+            ice::IceshardWorldContext& context,
             ice::Array<ice::UniquePtr<ice::IceshardTraitContext>> traits,
             ice::detail::TraitTaskTracker* task_tracker
         ) noexcept;
@@ -47,15 +47,18 @@ namespace ice
         auto devui() noexcept -> DevUI&;
 
     private:
+        ice::ProxyAllocator _allocator;
         ice::ecs::EntityStorage& _entity_storage;
         ice::ecs::EntityOperations _entity_operations;
-        ice::UniquePtr<ice::IceshardWorldContext> _context;
         ice::Array<ice::UniquePtr<ice::IceshardTraitContext>> _traits;
         ice::IceshardTasksLauncher _tasks_launcher;
 
     private:
         ice::UniquePtr<DevUI> _devui;
-        auto create_devui(ice::Allocator& alloc) noexcept -> ice::UniquePtr<DevUI>;
+        auto create_devui(
+            ice::Allocator& alloc,
+            ice::IceshardWorldContext& context
+        ) noexcept -> ice::UniquePtr<DevUI>;
     };
 
 } // namespace ice
diff --git a/source/code/iceshard/iceshard/private/iceshard_world_devui.cxx b/source/code/iceshard/iceshard/private/iceshard_world_devui.cxx
@@ -16,22 +16,27 @@ namespace ice
 
     } // namespace detail
 
-    auto IceshardWorld::create_devui(ice::Allocator& alloc) noexcept -> ice::UniquePtr<IceshardWorld::DevUI>
+    auto IceshardWorld::create_devui(
+        ice::Allocator& alloc,
+        ice::IceshardWorldContext& context
+    ) noexcept -> ice::UniquePtr<IceshardWorld::DevUI>
     {
         if (ice::devui_available())
         {
-            return ice::make_unique<DevUI>(alloc, alloc, *this);
+            return ice::make_unique<DevUI>(alloc, alloc, *this, context);
         }
         return {};
     }
 
     IceshardWorld::DevUI::DevUI(
         ice::Allocator& alloc,
-        ice::IceshardWorld& world
+        ice::IceshardWorld& world,
+        ice::IceshardWorldContext& context
     ) noexcept
         : DevUIWidget{ {.category = "Engine/Worlds", .name=ice::stringid_hint(world.worldID)} }
         , _allocator{ alloc }
         , _world{ world }
+        , _context{ context }
     {
         ice::devui_register_widget(this);
     }
@@ -71,7 +76,7 @@ namespace ice
 
         if (ImGui::CollapsingHeader("Handlers"))
         {
-            IceshardWorldContext const& ctx = *_world._context;
+            IceshardWorldContext const& ctx = _context;
             ImGui::TextT("Frame handlers (count: {})", ice::hashmap::count(ctx._frame_handlers));
             if (ice::hashmap::any(ctx._frame_handlers))
             {
diff --git a/source/code/iceshard/iceshard/private/iceshard_world_devui.hxx b/source/code/iceshard/iceshard/private/iceshard_world_devui.hxx
@@ -14,7 +14,8 @@ namespace ice
     public:
         DevUI(
             ice::Allocator& alloc,
-            ice::IceshardWorld& world
+            ice::IceshardWorld& world,
+            ice::IceshardWorldContext& context
         ) noexcept;
 
         void build_content() noexcept override;
@@ -23,6 +24,7 @@ namespace ice
     private:
         ice::Allocator& _allocator;
         ice::IceshardWorld& _world;
+        ice::IceshardWorldContext& _context;
     };
 
 } // namespace ice
diff --git a/source/code/iceshard/iceshard/private/iceshard_world_manager.cxx b/source/code/iceshard/iceshard/private/iceshard_world_manager.cxx
@@ -102,7 +102,9 @@ namespace ice
             world_template.name
         );
 
-        ice::UniquePtr<ice::IceshardWorldContext> world_context = ice::make_unique<ice::IceshardWorldContext>(_allocator, _allocator);
+        ice::UniquePtr<ice::IceshardWorldContext> world_context = ice::make_unique<ice::IceshardWorldContext>(
+            _allocator, _allocator, world_template.name
+        );
         ice::Array<ice::UniquePtr<ice::IceshardTraitContext>, ice::ContainerLogic::Complex> world_traits{ _allocator };
         for (ice::StringID_Arg traitid : world_template.traits)
         {
@@ -115,9 +117,9 @@ namespace ice
             if (desc != nullptr)
             {
                 ice::UniquePtr<ice::IceshardTraitContext> trait_context = ice::make_unique<ice::IceshardTraitContext>(
-                    _allocator, *world_context.get(), ice::array::count(world_traits)
+                    world_context->_allocator, *world_context.get(), ice::array::count(world_traits)
                 );
-                ice::UniquePtr<ice::Trait> trait = desc->fn_factory(_allocator, *trait_context.get(), desc->fn_factory_userdata);
+                ice::UniquePtr<ice::Trait> trait = desc->fn_factory(world_context->_allocator, *trait_context.get(), desc->fn_factory_userdata);
                 if (trait != nullptr)
                 {
                     trait_context->trait = ice::move(trait);
@@ -129,17 +131,16 @@ namespace ice
         _state_tracker.register_subname(world_template.name);
         //_state_tracker.initialize_subname_state(ice::StateGraph_WorldState, world_template.name);
 
-        Entry world_entry{
-            .world = ice::make_unique<ice::IceshardWorld>(
-                _allocator,
-                _allocator,
-                world_template.name,
-                world_template.entity_storage,
-                ice::move(world_context),
-                ice::move(world_traits),
-                _devui_tasks.get()
-            ),
-        };
+        Entry world_entry{ .context = ice::move(world_context) };
+        world_entry.world = ice::make_unique<ice::IceshardWorld>(
+            _allocator,
+            world_entry.context->_allocator,
+            world_template.name,
+            world_template.entity_storage,
+            *world_entry.context,
+            ice::move(world_traits),
+            _devui_tasks.get()
+        );
 
         // Add a new pending event
         ice::shards::push_back(
@@ -205,6 +206,7 @@ namespace ice
     {
         for (Entry& world_entry : ice::hashmap::values(_worlds))
         {
+            world_entry.context->close_checkpoints();
             world_entry.world->pre_update(out_shards);
         }
     }
diff --git a/source/code/iceshard/iceshard/private/iceshard_world_manager.hxx b/source/code/iceshard/iceshard/private/iceshard_world_manager.hxx
@@ -71,6 +71,7 @@ namespace ice
 
         struct Entry
         {
+            ice::UniquePtr<ice::IceshardWorldContext> context;
             ice::UniquePtr<ice::IceshardWorld> world;
             bool is_active;
         };
diff --git a/source/code/modules/imgui_module/private/imgui_trait.cxx b/source/code/modules/imgui_module/private/imgui_trait.cxx
@@ -32,7 +32,7 @@ namespace ice::devui
     ImGuiTrait::ImGuiTrait(ice::TraitContext& ctx, ice::Allocator& alloc, ImGuiSystem& system) noexcept
         : ice::Trait{ ctx }
         , ice::TraitDevUI{ {.category="Traits/Debug",.name="ImGUI-DevUI"} }
-        , _allocator{ alloc }
+        , _allocator{ alloc, "trait:devui-imgui" }
         , _system{ system }
         , _imgui_gfx_stage{ }
         , _resized{ false }
diff --git a/source/code/modules/imgui_module/private/imgui_trait.hxx b/source/code/modules/imgui_module/private/imgui_trait.hxx
@@ -50,7 +50,7 @@ namespace ice::devui
         void build_internal_command_list(ice::Span<ImGuiGfxStage::DrawCommand> draw_cmds) noexcept;
 
     private:
-        ice::Allocator& _allocator;
+        ice::ProxyAllocator _allocator;
         ice::devui::ImGuiSystem& _system;
         ice::devui::ImGuiStats _stats;
         ice::UniquePtr<ImGuiGfxStage> _imgui_gfx_stage;
diff --git a/tools/conanfile.txt b/tools/conanfile.txt
@@ -1,6 +1,6 @@
 [requires]
 fastbuild-installer/1.12@iceshard/stable
-ice-build-tools/1.9.1@iceshard/stable
+ice-build-tools/1.9.2@iceshard/stable
 
 [generators]
 VirtualRunEnv

Original file line number	Diff line number	Diff line change
`@@ -16,22 +16,27 @@ namespace ice`
`16`	`16`
`17`	`17`	`} // namespace detail`
`18`	`18`
`19`		`- auto IceshardWorld::create_devui(ice::Allocator& alloc) noexcept -> ice::UniquePtr<IceshardWorld::DevUI>`
	`19`	`+ auto IceshardWorld::create_devui(`
	`20`	`+ ice::Allocator& alloc,`
	`21`	`+ ice::IceshardWorldContext& context`
	`22`	`+ ) noexcept -> ice::UniquePtr<IceshardWorld::DevUI>`
`20`	`23`	`{`
`21`	`24`	`if (ice::devui_available())`
`22`	`25`	`{`
`23`		`- return ice::make_unique<DevUI>(alloc, alloc, *this);`
	`26`	`+ return ice::make_unique<DevUI>(alloc, alloc, *this, context);`
`24`	`27`	`}`
`25`	`28`	`return {};`
`26`	`29`	`}`
`27`	`30`
`28`	`31`	`IceshardWorld::DevUI::DevUI(`
`29`	`32`	`ice::Allocator& alloc,`
`30`		`- ice::IceshardWorld& world`
	`33`	`+ ice::IceshardWorld& world,`
	`34`	`+ ice::IceshardWorldContext& context`
`31`	`35`	`) noexcept`
`32`	`36`	`: DevUIWidget{ {.category = "Engine/Worlds", .name=ice::stringid_hint(world.worldID)} }`
`33`	`37`	`, _allocator{ alloc }`
`34`	`38`	`, _world{ world }`
	`39`	`+ , _context{ context }`
`35`	`40`	`{`
`36`	`41`	`ice::devui_register_widget(this);`
`37`	`42`	`}`
`@@ -71,7 +76,7 @@ namespace ice`
`71`	`76`
`72`	`77`	`if (ImGui::CollapsingHeader("Handlers"))`
`73`	`78`	`{`
`74`		`- IceshardWorldContext const& ctx = *_world._context;`
	`79`	`+ IceshardWorldContext const& ctx = _context;`
`75`	`80`	`ImGui::TextT("Frame handlers (count: {})", ice::hashmap::count(ctx._frame_handlers));`
`76`	`81`	`if (ice::hashmap::any(ctx._frame_handlers))`
`77`	`82`	`{`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ namespace ice`
`71`	`71`
`72`	`72`	`struct Entry`
`73`	`73`	`{`
	`74`	`+ ice::UniquePtr<ice::IceshardWorldContext> context;`
`74`	`75`	`ice::UniquePtr<ice::IceshardWorld> world;`
`75`	`76`	`bool is_active;`
`76`	`77`	`};`