Changeset 927 for XIOS/trunk/src

Timestamp:

09/08/16 11:18:51 (8 years ago)

Author:

rlacroix

Message:

Fix: Ensure that the buffer sizes needed to send the axis attributes are evaluated before actually sending any data.

This should avoid unexpected buffer requests (which would not cause any real issue most of the times since XIOS tries to recover from those).

Location:

XIOS/trunk/src/node

Files:

• axis.cpp (modified) (6 diffs)
• axis.hpp (modified) (3 diffs)
• grid.cpp (modified) (1 diff)

XIOS/trunk/src/node/axis.cpp

@@ -24 +24 @@
       : CObjectTemplate<CAxis>()
       , CAxisAttributes(), isChecked(false), relFiles(), areClientAttributesChecked_(false)
+      , isClientAfterTransformationChecked(false)
       , isDistributed_(false), hasBounds_(false), isCompressible_(false)
       , numberWrittenIndexes_(0), totalNumberWrittenIndexes_(0), offsetWrittenIndexes_(0)
@@ -33 +34 @@
       : CObjectTemplate<CAxis>(id)
       , CAxisAttributes(), isChecked(false), relFiles(), areClientAttributesChecked_(false)
+      , isClientAfterTransformationChecked(false)
       , isDistributed_(false), hasBounds_(false), isCompressible_(false)
       , numberWrittenIndexes_(0), totalNumberWrittenIndexes_(0), offsetWrittenIndexes_(0)
@@ -362 +364 @@
    }
 
+   void CAxis::checkAttributesOnClientAfterTransformation(const std::vector<int>& globalDim, int orderPositionInGrid,
+                                                          CServerDistributionDescription::ServerDistributionType distType)
+   {
+     CContext* context=CContext::getCurrent() ;
+
+     if (this->isClientAfterTransformationChecked) return;
+     if (context->hasClient)
+     {
+       if (n.getValue() != n_glo.getValue()) computeConnectedServer(globalDim, orderPositionInGrid, distType);
+     }
+
+     this->isClientAfterTransformationChecked = true;
+   }
+
    // Send all checked attributes to server
    void CAxis::sendCheckedAttributes(const std::vector<int>& globalDim, int orderPositionInGrid,
@@ -367 +383 @@
    {
      if (!this->areClientAttributesChecked_) checkAttributesOnClient();
+     if (!this->isClientAfterTransformationChecked) checkAttributesOnClientAfterTransformation(globalDim, orderPositionInGrid, distType);
      CContext* context = CContext::getCurrent();
 
@@ -373 +390 @@
      {
        sendServerAttribut(globalDim, orderPositionInGrid, distType);
-       if (hasValue) sendValue(globalDim, orderPositionInGrid, distType);
+       if (hasValue) sendValue();
      }
 
@@ -379 +396 @@
    }
 
-  void CAxis::sendValue(const std::vector<int>& globalDim, int orderPositionInGrid,
-                        CServerDistributionDescription::ServerDistributionType distType)
+  void CAxis::sendValue()
   {
      if (n.getValue() == n_glo.getValue())
-     {
        sendNonDistributedValue();
-     }
      else
-     {
-       computeConnectedServer(globalDim, orderPositionInGrid, distType);
        sendDistributedValue();
-     }
   }
 

XIOS/trunk/src/node/axis.hpp

@@ -104 +104 @@
          void recvServerAttribut(CBufferIn& buffer) ;
          void checkAttributesOnClient();
+         void checkAttributesOnClientAfterTransformation(const std::vector<int>& globalDim, int orderPositionInGrid,
+                                                         CServerDistributionDescription::ServerDistributionType distType = CServerDistributionDescription::BAND_DISTRIBUTION);
          void sendCheckedAttributes(const std::vector<int>& globalDim, int orderPositionInGrid,
                                     CServerDistributionDescription::ServerDistributionType disType = CServerDistributionDescription::BAND_DISTRIBUTION);
@@ -129 +131 @@
          void checkBounds();
          void checkTransformations();
-         void computeServerIndex(const std::vector<int>& globalDim, int orderPositionInGrid,
-                                 CServerDistributionDescription::ServerDistributionType disType);
-         void sendValue(const std::vector<int>& globalDim, int orderPositionInGrid,
-                        CServerDistributionDescription::ServerDistributionType distType);
+         void sendValue();
          void computeConnectedServer(const std::vector<int>& globalDim, int orderPositionInGrid,
                                      CServerDistributionDescription::ServerDistributionType distType);
@@ -150 +149 @@
          bool isChecked;
          bool areClientAttributesChecked_;
+         bool isClientAfterTransformationChecked;
          std::set<StdString> relFiles, relFilesCompressed;
          TransMapTypes transformationMap_;

XIOS/trunk/src/node/grid.cpp

@@ -166 +166 @@
    void CGrid::checkAttributesAfterTransformation()
    {
-     setDomainList();
-     std::vector<CDomain*> domListP = this->getDomains();
-     if (!domListP.empty())
-     {
-       for (int i = 0; i < domListP.size(); ++i)
-       {
-         domListP[i]->checkAttributesOnClientAfterTransformation();
-       }
-     }
+      setAxisList();
+      std::vector<CAxis*> axisListP = this->getAxis();
+      if (!axisListP.empty())
+      {
+        int idx = 0;
+        axisPositionInGrid_.resize(0);
+        for (int i = 0; i < axis_domain_order.numElements(); ++i)
+        {
+          int elementDimension = axis_domain_order(i);
+          if (1 == elementDimension)
+          {
+            axisPositionInGrid_.push_back(idx);
+            ++idx;
+          }
+          else if (2 == elementDimension) idx += 2;
+        }
+
+        for (int i = 0; i < axisListP.size(); ++i)
+        {
+          axisListP[i]->checkAttributesOnClientAfterTransformation(globalDim_,axisPositionInGrid_[i]);
+        }
+      }
+
+      setDomainList();
+      std::vector<CDomain*> domListP = this->getDomains();
+      if (!domListP.empty())
+      {
+        for (int i = 0; i < domListP.size(); ++i)
+        {
+          domListP[i]->checkAttributesOnClientAfterTransformation();
+        }
+      }
    }