Changeset 927 for XIOS/trunk/src/node/axis.cpp

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).

File:

• XIOS/trunk/src/node/axis.cpp (modified) (6 diffs)

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();
-     }
   }