Changeset 957

Timestamp:

09/30/16 15:28:05 (8 years ago)

Author:

rlacroix

Message:

Fix a possible crash caused by an infinite recursion.

The way virtual groups were handled could cause id clashes which lead to have groups containing themselves.

Location:

XIOS/trunk/src/node

Files:

• field.cpp (modified) (4 diffs)
• field.hpp (modified) (1 diff)
• file.cpp (modified) (4 diffs)
• file.hpp (modified) (1 diff)
• grid.cpp (modified) (3 diffs)
• grid.hpp (modified) (1 diff)

XIOS/trunk/src/node/field.cpp

@@ -37 +37 @@
       , useCompressedOutput(false)
       , isReadDataRequestPending(false)
-   { setVirtualVariableGroup(); }
+   { setVirtualVariableGroup(CVariableGroup::create(getId() + "_virtual_variable_group")); }
 
    CField::CField(const StdString& id)
@@ -48 +48 @@
       , useCompressedOutput(false)
       , isReadDataRequestPending(false)
-   { setVirtualVariableGroup(); }
+   { setVirtualVariableGroup(CVariableGroup::create(getId() + "_virtual_variable_group")); }
 
    CField::~CField(void)
@@ -60 +60 @@
    }
 
-   void CField::setVirtualVariableGroup(void)
-   {
-      this->setVirtualVariableGroup(CVariableGroup::create());
-   }
-
    CVariableGroup* CField::getVirtualVariableGroup(void) const
    {
       return this->vVariableGroup;
    }
-
 
    std::vector<CVariable*> CField::getAllVariables(void) const
@@ -1210 +1204 @@
    void CField::sendAddAllVariables()
    {
-     if (!getAllVariables().empty())
-     {
-       // Firstly, it's necessary to add virtual variable group
-       sendAddVariableGroup(getVirtualVariableGroup()->getId());
-
-       // Okie, now we can add to this variable group
-       std::vector<CVariable*> allVar = getAllVariables();
-       std::vector<CVariable*>::const_iterator it = allVar.begin();
-       std::vector<CVariable*>::const_iterator itE = allVar.end();
-
-       for (; it != itE; ++it)
-       {
-         this->sendAddVariable((*it)->getId());
-         (*it)->sendAllAttributesToServer();
-         (*it)->sendValue();
-       }
+     std::vector<CVariable*> allVar = getAllVariables();
+     std::vector<CVariable*>::const_iterator it = allVar.begin();
+     std::vector<CVariable*>::const_iterator itE = allVar.end();
+
+     for (; it != itE; ++it)
+     {
+       this->sendAddVariable((*it)->getId());
+       (*it)->sendAllAttributesToServer();
+       (*it)->sendValue();
      }
    }

XIOS/trunk/src/node/field.hpp

@@ -161 +161 @@
 
         void setVirtualVariableGroup(CVariableGroup* newVVariableGroup);
-        void setVirtualVariableGroup(void);
         CVariableGroup* getVirtualVariableGroup(void) const;
         vector<CVariable*> getAllVariables(void) const;

XIOS/trunk/src/node/file.cpp

@@ -26 +26 @@
       , allDomainEmpty(false), isOpen(false)
    {
-     setVirtualFieldGroup();
-     setVirtualVariableGroup();
+     setVirtualFieldGroup(CFieldGroup::create(getId() + "_virtual_field_group"));
+     setVirtualVariableGroup(CVariableGroup::create(getId() + "_virtual_variable_group"));
    }
 
@@ -35 +35 @@
       , allDomainEmpty(false), isOpen(false)
     {
-      setVirtualFieldGroup();
-      setVirtualVariableGroup();
+      setVirtualFieldGroup(CFieldGroup::create(getId() + "_virtual_field_group"));
+      setVirtualVariableGroup(CVariableGroup::create(getId() + "_virtual_variable_group"));
     }
 
@@ -187 +187 @@
    {
       this->vVariableGroup = newVVariableGroup;
-   }
-
-   //----------------------------------------------------------------
-   //! Create virtual field group, which is done normally on initializing file
-   void CFile::setVirtualFieldGroup(void)
-   {
-      this->setVirtualFieldGroup(CFieldGroup::create());
-   }
-
-   //! Create virtual variable group, which is done normally on initializing file
-   void CFile::setVirtualVariableGroup(void)
-   {
-      this->setVirtualVariableGroup(CVariableGroup::create());
    }
 
@@ -944 +931 @@
    void CFile::sendAddAllVariables()
    {
-     if (!getAllVariables().empty())
+     std::vector<CVariable*> allVar = getAllVariables();
+     std::vector<CVariable*>::const_iterator it = allVar.begin();
+     std::vector<CVariable*>::const_iterator itE = allVar.end();
+
+     for (; it != itE; ++it)
      {
-       // Firstly, it's necessary to add virtual variable group
-       sendAddVariableGroup(getVirtualVariableGroup()->getId());
-
-       // Okie, now we can add to this variable group
-       std::vector<CVariable*> allVar = getAllVariables();
-       std::vector<CVariable*>::const_iterator it = allVar.begin();
-       std::vector<CVariable*>::const_iterator itE = allVar.end();
-
-       for (; it != itE; ++it)
-       {
-         this->sendAddVariable((*it)->getId());
-         (*it)->sendAllAttributesToServer();
-         (*it)->sendValue();
-       }
+       this->sendAddVariable((*it)->getId());
+       (*it)->sendAllAttributesToServer();
+       (*it)->sendValue();
      }
    }

XIOS/trunk/src/node/file.hpp

@@ -92 +92 @@
          // Set some root definitions in a file
          void setVirtualFieldGroup(CFieldGroup* newVFieldGroup);
-         void setVirtualFieldGroup(void);
          void setVirtualVariableGroup(CVariableGroup* newVVariableGroup);
-         void setVirtualVariableGroup(void);
 
          void createHeader(void);

XIOS/trunk/src/node/grid.cpp

@@ -36 +36 @@
       , gridSrc_(), hasTransform_(false), isGenerated_(false), order_(), globalIndexOnServer_()
    {
-     setVirtualDomainGroup();
-     setVirtualAxisGroup();
-     setVirtualScalarGroup();
+     setVirtualDomainGroup(CDomainGroup::create(getId() + "_virtual_domain_group"));
+     setVirtualAxisGroup(CAxisGroup::create(getId() + "_virtual_axis_group"));
+     setVirtualScalarGroup(CScalarGroup::create(getId() + "_virtual_scalar_group"));
    }
 
@@ -54 +54 @@
       , gridSrc_(), hasTransform_(false), isGenerated_(false), order_(), globalIndexOnServer_()
    {
-     setVirtualDomainGroup();
-     setVirtualAxisGroup();
-     setVirtualScalarGroup();
+     setVirtualDomainGroup(CDomainGroup::create(getId() + "_virtual_domain_group"));
+     setVirtualAxisGroup(CAxisGroup::create(getId() + "_virtual_axis_group"));
+     setVirtualScalarGroup(CScalarGroup::create(getId() + "_virtual_scalar_group"));
    }
 
@@ -1482 +1482 @@
    }
 
-   //----------------------------------------------------------------
-   //! Create virtual field group, which is done normally on initializing file
-   void CGrid::setVirtualDomainGroup(void)
-   {
-      this->setVirtualDomainGroup(CDomainGroup::create());
-   }
-
-   //! Create virtual variable group, which is done normally on initializing file
-   void CGrid::setVirtualAxisGroup(void)
-   {
-      this->setVirtualAxisGroup(CAxisGroup::create());
-   }
-
-   //! Create virtual variable group, which is done normally on initializing file
-   void CGrid::setVirtualScalarGroup(void)
-   {
-      this->setVirtualScalarGroup(CScalarGroup::create());
-   }
-
    /*!
    \brief Send a message to create a domain on server side

XIOS/trunk/src/node/grid.hpp

@@ -244 +244 @@
 
         void setVirtualDomainGroup(CDomainGroup* newVDomainGroup);
-        void setVirtualDomainGroup();
         void setVirtualAxisGroup(CAxisGroup* newVAxisGroup);
-        void setVirtualAxisGroup();
         void setVirtualScalarGroup(CScalarGroup* newVScalarGroup);
-        void setVirtualScalarGroup();
 
         void setDomainList(const std::vector<CDomain*> domains = std::vector<CDomain*>());