[arcane,std] Créé une classe 'VariableDataInfoMap' pour contenir la liste des informations des variables.

Author: grospelliergilles

arcane/src/arcane/std/BasicGenericReader.cc

@@ -124,8 +124,7 @@ initialize(const String& path, Int32 rank)
   for (Integer i = 0, is = variables_elem.size(); i < is; ++i) {
     XmlNode n = variables_elem[i];
     String var_full_name = n.attrValue("full-name");
-    Ref<VariableDataInfo> vdi = makeRef(new VariableDataInfo(var_full_name, n));
-    m_variables_data_info.insert(std::make_pair(var_full_name, vdi));
+    m_variables_data_info.add(var_full_name, n);
   }
 
   if (!m_text_reader.get()) {
@@ -148,11 +147,10 @@ initialize(const String& path, Int32 rank)
 Ref<VariableDataInfo> BasicGenericReader::
 _getVarInfo(const String& full_name)
 {
-  VariableDataInfoMap::const_iterator ivar = m_variables_data_info.find(full_name);
-  if (ivar == m_variables_data_info.end())
+  Ref<VariableDataInfo> vdi = m_variables_data_info.find(full_name);
+  if (!vdi.get())
     ARCANE_THROW(ReaderWriterException,
                  "Can not find own metadata infos for data var={0} rank={1}", full_name, m_rank);
-  Ref<VariableDataInfo> vdi = ivar->second;
   return vdi;
 }
 

arcane/src/arcane/std/BasicGenericWriter.cc

@@ -64,10 +64,9 @@ void BasicGenericWriter::
 writeData(const String& var_full_name, const ISerializedData* sdata)
 {
   //TODO: Verifier que initialize() a bien été appelé.
-  auto var_data_info = makeRef(new VariableDataInfo(var_full_name, sdata));
+  auto var_data_info = m_variables_data_info.add(var_full_name, sdata);
   KeyValueTextWriter* writer = m_text_writer.get();
   var_data_info->setFileOffset(writer->fileOffset());
-  m_variables_data_info.insert(std::make_pair(var_full_name, var_data_info));
   info(4) << " SDATA name=" << var_full_name << " nb_element=" << sdata->nbElement()
           << " dim=" << sdata->nbDimension() << " datatype=" << sdata->baseDataType()
           << " nb_basic_element=" << sdata->nbBaseElement()

arcane/src/arcane/std/VariableDataInfo.cc

@@ -16,6 +16,7 @@
 #include "arcane/utils/FatalErrorException.h"
 #include "arcane/utils/Array.h"
 #include "arcane/utils/ValueConvert.h"
+#include "arcane/utils/Ref.h"
 
 #include "arcane/core/ISerializedData.h"
 
@@ -106,6 +107,43 @@ write(XmlNode element) const
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+
+Ref<VariableDataInfo> VariableDataInfoMap::
+add(const String& full_name, const ISerializedData* sdata)
+{
+  auto v = makeRef(new VariableDataInfo(full_name, sdata));
+  m_data_info_map.insert(std::make_pair(full_name, v));
+  return v;
+}
+
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+
+Ref<VariableDataInfo> VariableDataInfoMap::
+add(const String& full_name, const XmlNode& node)
+{
+  auto v = makeRef(new VariableDataInfo(full_name, node));
+  m_data_info_map.insert(std::make_pair(full_name, v));
+  return v;
+}
+
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+
+Ref<VariableDataInfo> VariableDataInfoMap::
+find(const String& full_name) const
+{
+  auto ivar = m_data_info_map.find(full_name);
+  if (ivar != m_data_info_map.end())
+    return ivar->second;
+  return {};
+}
+
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+
 } // namespace Arcane::impl
 
 /*---------------------------------------------------------------------------*/

arcane/src/arcane/std/internal/BasicReaderWriter.h

@@ -122,8 +122,6 @@ class BasicGenericReader
 
  private:
 
-  using VariableDataInfoMap = std::map<String, Ref<VariableDataInfo>>;
-
   IApplication* m_application = nullptr;
   Ref<KeyValueTextReader> m_text_reader;
   String m_path;
@@ -180,8 +178,6 @@ class BasicGenericWriter
 
  private:
 
-  using VariableDataInfoMap = std::map<String, Ref<VariableDataInfo>>;
-
   IApplication* m_application = nullptr;
   Int32 m_version = -1;
   String m_path;

arcane/src/arcane/std/internal/VariableDataInfo.h

@@ -21,6 +21,8 @@
 #include "arcane/core/ArcaneTypes.h"
 #include "arcane/core/XmlNode.h"
 
+#include <map>
+
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
@@ -107,6 +109,38 @@ class VariableDataInfo
   ArrayShape m_shape;
 };
 
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+/*!
+ * \brief Tableau associatif des données des variables.
+ */
+class VariableDataInfoMap
+{
+  using MapType = std::map<String, Ref<VariableDataInfo>>;
+
+ public:
+
+  using const_iterator = MapType::const_iterator;
+
+ public:
+
+  //! Ajoute une variable
+  Ref<VariableDataInfo> add(const String& full_name, const ISerializedData* sdata);
+  //! Ajoute une variable
+  Ref<VariableDataInfo> add(const String& full_name, const XmlNode& node);
+
+  //! Retourne la variable de nom \a full_name. Retourne null si non trouvé.
+  Ref<VariableDataInfo> find(const String& full_name) const;
+
+  //@{ //! Itérateurs
+  const_iterator begin() const { return m_data_info_map.begin(); }
+  const_iterator end() const { return m_data_info_map.end(); }
+  //@}
+
+ private:
+
+  MapType m_data_info_map;
+};
 
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/