Make Ichor::Dependency trivially default constructible, for optimal u…

…sage with StaticVector
volt-software · Feb 22, 2024 · 1e58222 · 1e58222
1 parent aa7966f
commit 1e58222
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/include/ichor/dependency_management/Dependency.h b/include/ichor/dependency_management/Dependency.h
@@ -19,7 +19,8 @@ namespace Ichor {
     }
 
     struct Dependency {
-        Dependency(uint64_t _interfaceNameHash, std::string_view _interfaceName, DependencyFlags _flags, uint64_t _satisfied) noexcept : interfaceNameHash(_interfaceNameHash), interfaceName(_interfaceName), flags(_flags), satisfied(_satisfied) {}
+        Dependency() noexcept = default;
+        Dependency(uint64_t _interfaceNameHash, char const *_interfaceName, DependencyFlags _flags, uint64_t _satisfied) noexcept : interfaceNameHash(_interfaceNameHash), interfaceName(_interfaceName), flags(_flags), satisfied(_satisfied) {}
         Dependency(const Dependency &other) noexcept = default;
         Dependency(Dependency &&other) noexcept = default;
         Dependency& operator=(const Dependency &other) noexcept = default;
@@ -29,10 +30,13 @@ namespace Ichor {
         }
 
         uint64_t interfaceNameHash;
-        std::string_view interfaceName;
+        char const *interfaceName;
         DependencyFlags flags;
         uint64_t satisfied;
     };
+
+    static_assert(std::is_trivially_default_constructible_v<Dependency>, "Dependency is required to be trivially default constructible");
+    static_assert(std::is_trivially_destructible_v<Dependency>, "Dependency is required to be trivially destructible");
 }
 
 

diff --git a/include/ichor/dependency_management/DependencyLifecycleManager.h b/include/ichor/dependency_management/DependencyLifecycleManager.h
@@ -11,7 +11,7 @@ namespace Ichor::Detail {
     class DependencyLifecycleManager final : public ILifecycleManager {
     public:
         explicit DependencyLifecycleManager(Properties&& properties) : _interfaces(), _registry(), _service(_registry, std::move(properties)) {
-            (_interfaces.emplace_back(typeNameHash<IFaces>(), typeName<IFaces>(), DependencyFlags::NONE, false),...);
+            (_interfaces.emplace_back(typeNameHash<IFaces>(), typeName<IFaces>().data(), DependencyFlags::NONE, false),...);
         }
 
         ~DependencyLifecycleManager() final {

diff --git a/include/ichor/dependency_management/DependencyManagerLifecycleManager.h b/include/ichor/dependency_management/DependencyManagerLifecycleManager.h
@@ -8,7 +8,7 @@ namespace Ichor::Detail {
     class DependencyManagerLifecycleManager final : public ILifecycleManager {
     public:
         explicit DependencyManagerLifecycleManager(DependencyManager *dm) : _dm(dm) {
-            _interfaces.emplace_back(typeNameHash<DependencyManager>(), typeName<DependencyManager>(), DependencyFlags::NONE, false);
+            _interfaces.emplace_back(typeNameHash<DependencyManager>(), typeName<DependencyManager>().data(), DependencyFlags::NONE, false);
         }
 
         ~DependencyManagerLifecycleManager() final = default;

diff --git a/include/ichor/dependency_management/DependencyRegister.h b/include/ichor/dependency_management/DependencyRegister.h
@@ -22,7 +22,7 @@ namespace Ichor {
 #endif
 
             _registrations.emplace(typeNameHash<Interface>(), std::make_tuple(
-                    Dependency{typeNameHash<Interface>(), typeName<Interface>(), flags, 0},
+                    Dependency{typeNameHash<Interface>(), typeName<Interface>().data(), flags, 0},
                     std::function<void(NeverNull<void*>, IService&)>{[svc](NeverNull<void*> dep, IService& isvc){ svc->addDependencyInstance(*reinterpret_cast<Interface*>(dep.get()), isvc); }},
                     std::function<void(NeverNull<void*>, IService&)>{[svc](NeverNull<void*> dep, IService& isvc){ svc->removeDependencyInstance(*reinterpret_cast<Interface*>(dep.get()), isvc); }},
                     std::move(props)));
@@ -34,7 +34,7 @@ namespace Ichor {
             static_assert(!DerivedTemplated<Interface, AdvancedService>, "Interface needs to be a non-service class.");
 
             _registrations.emplace(typeNameHash<Interface>(), std::make_tuple(
-                    Dependency{typeNameHash<Interface>(), typeName<Interface>(), DependencyFlags::REQUIRED, 0},
+                    Dependency{typeNameHash<Interface>(), typeName<Interface>().data(), DependencyFlags::REQUIRED, 0},
                     std::function<void(NeverNull<void*>, IService&)>{[svc](NeverNull<void*> dep, IService& isvc){ svc->template addDependencyInstance<Interface>(reinterpret_cast<Interface*>(dep.get()), &isvc); }},
                     std::function<void(NeverNull<void*>, IService&)>{[svc](NeverNull<void*> dep, IService& isvc){ svc->template removeDependencyInstance<Interface>(reinterpret_cast<Interface*>(dep.get()), &isvc); }},
                     tl::optional<Properties>{}));

diff --git a/include/ichor/dependency_management/IServiceInterestedLifecycleManager.h b/include/ichor/dependency_management/IServiceInterestedLifecycleManager.h
@@ -7,7 +7,7 @@ namespace Ichor::Detail {
     class IServiceInterestedLifecycleManager final : public ILifecycleManager {
     public:
         IServiceInterestedLifecycleManager(IService *self) : _self(self) {
-            _interfaces.emplace_back(typeNameHash<IService>(), typeName<IService>(), DependencyFlags::NONE, false);
+            _interfaces.emplace_back(typeNameHash<IService>(), typeName<IService>().data(), DependencyFlags::NONE, false);
         }
         ~IServiceInterestedLifecycleManager() final = default;
 

diff --git a/include/ichor/dependency_management/LifecycleManager.h b/include/ichor/dependency_management/LifecycleManager.h
@@ -15,12 +15,12 @@ namespace Ichor::Detail {
     public:
         template <typename U = ServiceType> requires RequestsProperties<U>
         explicit LifecycleManager(Properties&& properties) : _interfaces(), _service(std::forward<Properties>(properties)) {
-            (_interfaces.emplace_back(typeNameHash<IFaces>(), typeName<IFaces>(), DependencyFlags::NONE, false),...);
+            (_interfaces.emplace_back(typeNameHash<IFaces>(), typeName<IFaces>().data(), DependencyFlags::NONE, false),...);
         }
 
         template <typename U = ServiceType> requires (!RequestsProperties<U>)
         explicit LifecycleManager(Properties&& properties) : _interfaces(), _service() {
-            (_interfaces.emplace_back(typeNameHash<IFaces>(), typeName<IFaces>(), DependencyFlags::NONE, false),...);
+            (_interfaces.emplace_back(typeNameHash<IFaces>(), typeName<IFaces>().data(), DependencyFlags::NONE, false),...);
             _service.setProperties(std::forward<Properties>(properties));
         }
 

diff --git a/include/ichor/dependency_management/QueueLifecycleManager.h b/include/ichor/dependency_management/QueueLifecycleManager.h
@@ -9,7 +9,7 @@ namespace Ichor::Detail {
     class QueueLifecycleManager final : public ILifecycleManager {
     public:
         explicit QueueLifecycleManager(IEventQueue *q) : _q(q) {
-            _interfaces.emplace_back(typeNameHash<IEventQueue>(), typeName<IEventQueue>(), DependencyFlags::NONE, false);
+            _interfaces.emplace_back(typeNameHash<IEventQueue>(), typeName<IEventQueue>().data(), DependencyFlags::NONE, false);
         }
 
         ~QueueLifecycleManager() final = default;

diff --git a/src/ichor/DependencyManager.cpp b/src/ichor/DependencyManager.cpp
@@ -32,8 +32,6 @@ namespace backward {
 }
 #endif
 
-static_assert(!Ichor::Detail::is_sufficiently_trivial<Ichor::Dependency>, "Ichor::Dependency not sufficiently non-trivial");
-
 Ichor::DependencyManager::DependencyManager(IEventQueue *eventQueue) : _eventQueue(eventQueue) {
     auto qlm = std::make_unique<Detail::QueueLifecycleManager>(_eventQueue);
     _services.emplace(qlm->serviceId(), std::move(qlm));