Merge pull request #1182 from arcaneframework/dev/gg-add-localid-for-componentiteminternal

Add class 'ComponentItemInternaLocalId' to store an index instead of a pointer

Author: grospelliergilles

arcane/src/arcane/core/materials/ComponentItemInternal.h

@@ -1,11 +1,11 @@
 // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
 //-----------------------------------------------------------------------------
-// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
+// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: Apache-2.0
 //-----------------------------------------------------------------------------
 /*---------------------------------------------------------------------------*/
-/* ComponentItemInternal.h                                     (C) 2000-2023 */
+/* ComponentItemInternal.h                                     (C) 2000-2024 */
 /*                                                                           */
 /* Partie interne d'une maille multi-matériau.                               */
 /*---------------------------------------------------------------------------*/
@@ -24,13 +24,35 @@
 namespace Arcane::Materials
 {
 
+
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+/*!
+ * \internal
+ */
+class ARCANE_CORE_EXPORT ComponentItemInternalLocalId
+{
+ public:
+
+  ComponentItemInternalLocalId() = default;
+  explicit ARCCORE_HOST_DEVICE ComponentItemInternalLocalId(Int32 id)
+  : m_id(id)
+  {}
+  ARCCORE_HOST_DEVICE Int32 localId() const { return m_id; }
+
+ private:
+
+  Int32 m_id = -1;
+};
+
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
 class ARCANE_CORE_EXPORT ComponentItemSharedInfo
 {
   friend class ComponentItemInternal;
   friend class ComponentItemInternalData;
+  friend class CellComponentCellEnumerator;
 
  private:
 
@@ -41,9 +63,14 @@ class ARCANE_CORE_EXPORT ComponentItemSharedInfo
 
  private:
 
+  // NOTE : Cette classe est partagée avec le wrapper C#
+  // Toute modification de la structure interne doit être reportée
+  // dans la structure C# correspondante
   ItemSharedInfo* m_item_shared_info = ItemSharedInfo::nullInstance();
   Int16 m_level = (-1);
   ConstArrayView<IMeshComponent*> m_components;
+  ComponentItemSharedInfo* m_parent_component_item_shared_info = null_shared_info_pointer;
+  ArrayView<ComponentItemInternal> m_component_item_internal_view;
 };
 
 /*---------------------------------------------------------------------------*/
@@ -183,8 +210,9 @@ class ARCANE_CORE_EXPORT ComponentItemInternal
   Int16 m_component_id = -1;
   Int16 m_nb_sub_component_item = 0;
   Int32 m_global_item_local_id = NULL_ITEM_LOCAL_ID;
-  ComponentItemInternal* m_super_component_item = nullptr;
-  ComponentItemInternal* m_first_sub_component_item = nullptr;
+  ComponentItemInternalLocalId m_component_item_internal_local_id;
+  ComponentItemInternalLocalId m_super_component_item_local_id;
+  ComponentItemInternalLocalId m_first_sub_component_item_local_id;
   ComponentItemSharedInfo* m_shared_info = nullptr;
 
  private:
@@ -213,12 +241,13 @@ class ARCANE_CORE_EXPORT ComponentItemInternal
   //! Composant supérieur (0 si aucun)
   matimpl::ConstituentItemBase _superItemBase() const
   {
-    return m_super_component_item;
+    return &m_shared_info->m_component_item_internal_view[m_super_component_item_local_id.localId()];
   }
 
   void _setSuperAndGlobalItem(ComponentItemInternal* cii, ItemLocalId ii)
   {
-    m_super_component_item = cii;
+    if (cii)
+      m_super_component_item_local_id = cii->_internalLocalId();
     m_global_item_local_id = ii.localId();
   }
 
@@ -228,9 +257,14 @@ class ARCANE_CORE_EXPORT ComponentItemInternal
   }
 
   //! Première entité sous-composant.
-  ARCCORE_HOST_DEVICE ComponentItemInternal* _firstSubItem() const
+  ARCCORE_HOST_DEVICE ComponentItemInternalLocalId _firstSubItemLocalId() const
   {
-    return m_first_sub_component_item;
+    return m_first_sub_component_item_local_id;
+  }
+
+  ARCCORE_HOST_DEVICE ComponentItemInternal* _subItem(Int32 i) const
+  {
+    return &m_shared_info->m_component_item_internal_view[m_first_sub_component_item_local_id.localId() + i];
   }
 
   //! Positionne le nombre de sous-composants.
@@ -245,7 +279,8 @@ class ARCANE_CORE_EXPORT ComponentItemInternal
   //! Positionne le premier sous-composant.
   void _setFirstSubItem(ComponentItemInternal* first_sub_item)
   {
-    m_first_sub_component_item = first_sub_item;
+    if (first_sub_item)
+      m_first_sub_component_item_local_id = first_sub_item->_internalLocalId();
   }
 
   void _setComponent(Int32 component_id)
@@ -256,13 +291,19 @@ class ARCANE_CORE_EXPORT ComponentItemInternal
     m_component_id = static_cast<Int16>(component_id);
   }
 
-  void _reset(ComponentItemSharedInfo* shared_info)
+  ComponentItemInternalLocalId _internalLocalId() const
+  {
+    return m_component_item_internal_local_id;
+  }
+
+  void _reset(ComponentItemInternalLocalId id, ComponentItemSharedInfo* shared_info)
   {
     m_var_index.reset();
     m_component_id = -1;
-    m_super_component_item = nullptr;
+    m_super_component_item_local_id = {};
+    m_component_item_internal_local_id = id;
     m_nb_sub_component_item = 0;
-    m_first_sub_component_item = nullptr;
+    m_first_sub_component_item_local_id = {};
     m_global_item_local_id = NULL_ITEM_LOCAL_ID;
     m_shared_info = shared_info;
   }

arcane/src/arcane/core/materials/MatItem.h

@@ -155,7 +155,7 @@ class EnvCell
   //! i-ème maille matériau de cette maille
   inline MatCell cell(Integer i)
   {
-    return matimpl::ConstituentItemBase(m_internal->_firstSubItem() + i);
+    return matimpl::ConstituentItemBase(m_internal->_subItem(i));
   }
 
   //! Milieu associé
@@ -225,7 +225,7 @@ class AllEnvCell
   //! i-ème maille milieu
   EnvCell cell(Int32 i) const
   {
-    return EnvCell(matimpl::ConstituentItemBase(m_internal->_firstSubItem() + i));
+    return EnvCell(matimpl::ConstituentItemBase(m_internal->_subItem(i)));
   }
 };
 

arcane/src/arcane/core/materials/MatItemEnumerator.h

@@ -1,11 +1,11 @@
 // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
 //-----------------------------------------------------------------------------
-// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
+// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: Apache-2.0
 //-----------------------------------------------------------------------------
 /*---------------------------------------------------------------------------*/
-/* MatItemEnumerator.h                                         (C) 2000-2023 */
+/* MatItemEnumerator.h                                         (C) 2000-2024 */
 /*                                                                           */
 /* Enumérateurs sur les mailles materiaux.                                   */
 /*---------------------------------------------------------------------------*/
@@ -341,7 +341,7 @@ class ARCANE_CORE_EXPORT  EnvPartCellEnumerator
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 /*!
- * \brief Enumérateur sur les matériaux d'une maille.
+ * \brief Enumérateur sur les constituants d'une maille.
  */
 class ARCANE_CORE_EXPORT CellComponentCellEnumerator
 {
@@ -350,7 +350,9 @@ class ARCANE_CORE_EXPORT CellComponentCellEnumerator
  public:
 
   ARCCORE_HOST_DEVICE explicit CellComponentCellEnumerator(ComponentCell super_item)
-  : m_index(0), m_size(super_item._internal()->nbSubItem()), m_items_begin(super_item._internal()->_firstSubItem())
+  : m_size(super_item._internal()->nbSubItem())
+  , m_items_begin(super_item._internal()->_firstSubItemLocalId().localId())
+  , m_item_internal_list(super_item._internal()->m_shared_info->m_component_item_internal_view)
   {
   }
 
@@ -362,20 +364,28 @@ class ARCANE_CORE_EXPORT CellComponentCellEnumerator
   ARCCORE_HOST_DEVICE ComponentCell operator*() const
   {
     ARCANE_CHECK_AT(m_index,m_size);
-    return ComponentCell(matimpl::ConstituentItemBase(m_items_begin+m_index));
+    return ComponentCell(_currentItemBase());
   }
-  ARCCORE_HOST_DEVICE MatVarIndex _varIndex() const { return m_items_begin[m_index].variableIndex(); }
+  ARCCORE_HOST_DEVICE MatVarIndex _varIndex() const { return m_item_internal_list[m_items_begin+m_index].variableIndex(); }
   ARCCORE_HOST_DEVICE Integer index() const { return m_index; }
   ARCCORE_HOST_DEVICE operator ComponentItemLocalId() const
   {
-    return ComponentItemLocalId(m_items_begin[m_index].variableIndex());
+    return ComponentItemLocalId(_varIndex());
   }
 
  protected:
 
- Integer m_index;
-  Integer m_size;
-  ComponentItemInternal* m_items_begin;
+  Int32 m_index = 0;
+  Int32 m_size = 0;
+  Int32 m_items_begin = -1;
+  ArrayView<ComponentItemInternal> m_item_internal_list;
+
+ protected:
+
+ ARCCORE_HOST_DEVICE matimpl::ConstituentItemBase _currentItemBase() const
+  {
+    return matimpl::ConstituentItemBase(const_cast<ComponentItemInternal*>(m_item_internal_list.ptrAt(m_items_begin+m_index)));
+  }
 };
 
 /*---------------------------------------------------------------------------*/
@@ -396,7 +406,7 @@ template <typename ComponentCellType> class CellComponentCellEnumeratorT
   ARCCORE_HOST_DEVICE ComponentCellType operator*() const
   {
     ARCANE_CHECK_AT(m_index,m_size);
-    return ComponentCellType(matimpl::ConstituentItemBase(m_items_begin+m_index));
+    return ComponentCellType(_currentItemBase());
   }
 };
 

arcane/src/arcane/materials/ComponentItemInternalData.cc

@@ -35,6 +35,7 @@ ComponentItemInternalData(MeshMaterialMng* mmg)
 , m_material_mng(mmg)
 , m_component_item_internal_storage(MemoryUtils::getAllocatorForMostlyReadOnlyData())
 , m_shared_infos(MemoryUtils::getAllocatorForMostlyReadOnlyData())
+, m_mat_items_internal_range(MemoryUtils::getAllocatorForMostlyReadOnlyData())
 {
   // Il y a une instance pour les MatCell, les EnvCell et les AllEnvCell
   // Il ne faut ensuite plus modifier ce tableau car on conserve des pointeurs
@@ -49,9 +50,8 @@ void ComponentItemInternalData::
 endCreate()
 {
   const Int32 nb_env = m_material_mng->environments().size();
-  m_mat_items_internal.clear();
   m_mat_items_internal.resize(nb_env);
-
+  m_mat_items_internal_range.resize(nb_env);
   _initSharedInfos();
 }
 
@@ -63,20 +63,21 @@ endCreate()
 void ComponentItemInternalData::
 _resetItemsInternal()
 {
+  ComponentItemInternalLocalId internal_local_id;
+  ArrayView<ComponentItemInternal> storage = m_component_item_internal_storage;
+
   ComponentItemSharedInfo* all_env_shared_info = allEnvSharedInfo();
-  for (ComponentItemInternal& x : m_all_env_items_internal)
-    x._reset(all_env_shared_info);
+  for (ComponentItemInternalLocalId id : m_all_env_items_internal_range)
+    storage[id.localId()]._reset(id, all_env_shared_info);
 
   ComponentItemSharedInfo* env_shared_info = envSharedInfo();
-  for (ComponentItemInternal& x : m_env_items_internal)
-    x._reset(env_shared_info);
-
-  for (const MeshEnvironment* env : m_material_mng->trueEnvironments()) {
-    ArrayView<ComponentItemInternal> mat_items_internal = matItemsInternal(env->id());
-    ComponentItemSharedInfo* mat_shared_info = matSharedInfo();
-    for (ComponentItemInternal& x : mat_items_internal) {
-      x._reset(mat_shared_info);
-    }
+  for (ComponentItemInternalLocalId id : m_env_items_internal_range)
+    storage[id.localId()]._reset(id, env_shared_info);
+
+  ComponentItemSharedInfo* mat_shared_info = matSharedInfo();
+  for (ComponentItemInternalRange mat_range : m_mat_items_internal_range) {
+    for (ComponentItemInternalLocalId id : mat_range)
+      storage[id.localId()]._reset(id, mat_shared_info);
   }
 }
 
@@ -93,6 +94,7 @@ resizeComponentItemInternals(Int32 max_local_id, Int32 total_env_cell)
   // dès qu'un des nombre d'élément change.
   Int32 total_nb_internal = 0;
   total_nb_internal += max_local_id; // Pour les AllEnvCell
+
   total_nb_internal += total_env_cell; // Pour les EnvCell
   for (const MeshEnvironment* env : m_material_mng->trueEnvironments())
     total_nb_internal += env->totalNbCellMat();
@@ -103,16 +105,24 @@ resizeComponentItemInternals(Int32 max_local_id, Int32 total_env_cell)
   // Maintenant récupère les vues sur chaque partie de 'm_component_item_internal_storage'
   {
     m_all_env_items_internal = m_component_item_internal_storage.subView(0, max_local_id);
+    m_all_env_items_internal_range.setRange(0, max_local_id);
     m_env_items_internal = m_component_item_internal_storage.subView(max_local_id, total_env_cell);
+    m_env_items_internal_range.setRange(max_local_id, total_env_cell);
     Int32 index_in_container = max_local_id + total_env_cell;
     for (const MeshEnvironment* env : m_material_mng->trueEnvironments()) {
       Int32 nb_cell_mat = env->totalNbCellMat();
-      m_mat_items_internal[env->id()] = m_component_item_internal_storage.subView(index_in_container, nb_cell_mat);
+      Int32 env_id = env->id();
+      m_mat_items_internal[env_id] = m_component_item_internal_storage.subView(index_in_container, nb_cell_mat);
+      m_mat_items_internal_range[env_id].setRange(index_in_container, nb_cell_mat);
       index_in_container += nb_cell_mat;
     }
   }
 
   _resetItemsInternal();
+
+  // Met à jour les vues sur m_component_item_internal_storage.
+  for (ComponentItemSharedInfo& x : m_shared_infos)
+    x.m_component_item_internal_view = m_component_item_internal_storage;
 }
 
 /*---------------------------------------------------------------------------*/
@@ -128,20 +138,22 @@ _initSharedInfos()
   // ne faut pas que conteneurs associés de \a m_materials_mng soient modifiées.
   // Normalement ce n'est pas le cas, car la liste des constituants est fixe.
   ComponentItemSharedInfo* info_mat = sharedInfo(LEVEL_MATERIAL);
+  ComponentItemSharedInfo* info_env = sharedInfo(LEVEL_ENVIRONMENT);
+  ComponentItemSharedInfo* info_all_env = sharedInfo(LEVEL_ALLENVIRONMENT);
+
   info_mat->m_level = LEVEL_MATERIAL;
   info_mat->m_item_shared_info = item_shared_info;
   info_mat->m_components = m_material_mng->materialsAsComponents();
+  info_mat->m_parent_component_item_shared_info = info_env;
 
-  ComponentItemSharedInfo* info_env = sharedInfo(LEVEL_ENVIRONMENT);
   info_env->m_level = LEVEL_ENVIRONMENT;
   info_env->m_item_shared_info = item_shared_info;
   info_env->m_components = m_material_mng->environmentsAsComponents();
+  info_env->m_parent_component_item_shared_info = info_all_env;
 
-  ComponentItemSharedInfo* info_all_env = sharedInfo(LEVEL_ALLENVIRONMENT);
   info_all_env->m_level = LEVEL_ALLENVIRONMENT;
   info_all_env->m_item_shared_info = item_shared_info;
   info_all_env->m_components = ConstArrayView<IMeshComponent*>();
-
   info() << "EndCreate ComponentItemInternalData nb_mat=" << info_mat->m_components.size()
          << " nb_env=" << info_env->m_components.size();
 }