Changeset 1205 for XIOS/dev/branch_yushan_merged/src/node/context.cpp

Timestamp:

07/10/17 18:17:04 (7 years ago)

Author:

yushan

Message:

branch merged with trunk @1200

File:

• XIOS/dev/branch_yushan_merged/src/node/context.cpp (modified) (9 diffs)

XIOS/dev/branch_yushan_merged/src/node/context.cpp

@@ -14 +14 @@
 #include "type.hpp"
 #include "xios_spl.hpp"
+#include "timer.hpp"
+#include "memtrack.hpp"
+
 
 namespace xios {
@@ -278 +281 @@
    void CContext::setClientServerBuffer()
    {
-     size_t minBufferSize = CXios::minBufferSize;
+     // Estimated minimum event size for small events (10 is an arbitrary constant just for safety)
+     const size_t minEventSize = CEventClient::headerSize + getIdServer().size() + 10 * sizeof(int);
+     // Ensure there is at least some room for 20 of such events in the buffers
+     size_t minBufferSize = std::max(CXios::minBufferSize, 20 * minEventSize);
 #define DECLARE_NODE(Name_, name_)    \
      if (minBufferSize < sizeof(C##Name_##Definition)) minBufferSize = sizeof(C##Name_##Definition);
@@ -286 +292 @@
 #undef DECLARE_NODE_PAR
 
+     // Compute the buffer sizes needed to send the attributes and data corresponding to fields
      std::map<int, StdSize> maxEventSize;
      std::map<int, StdSize> bufferSize = getAttributesBufferSize(maxEventSize);
@@ -294 +301 @@
        if (it->second > bufferSize[it->first]) bufferSize[it->first] = it->second;
 
+     // Apply the buffer size factor and check that we are above the minimum buffer size
      ite = bufferSize.end();
      for (it = bufferSize.begin(); it != ite; ++it)
@@ -301 +309 @@
      }
 
-     // We consider that the minimum buffer size is also the minimum event size
-     ite = maxEventSize.end();
-     for (it = maxEventSize.begin(); it != ite; ++it)
-       if (it->second < minBufferSize) it->second = minBufferSize;
-
+     // Leaders will have to send some control events so ensure there is some room for those in the buffers
      if (client->isServerLeader())
      {
        const std::list<int>& ranks = client->getRanksServerLeader();
        for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
-         if (!bufferSize.count(*itRank)) bufferSize[*itRank] = maxEventSize[*itRank] = minBufferSize;
+       {
+         if (!bufferSize.count(*itRank))
+         {
+           bufferSize[*itRank] = minBufferSize;
+           maxEventSize[*itRank] = minEventSize;
+         }
+       }
      }
 
@@ -401 +411 @@
    void CContext::closeDefinition(void)
    {
+     CTimer::get("Context : close definition").resume() ;
      // There is nothing client need to send to server
      if (hasClient)
@@ -454 +465 @@
       startPrefetchingOfEnabledReadModeFiles();
     }
+    CTimer::get("Context : close definition").suspend() ;
    }
 
@@ -1206 +1218 @@
    void CContext::updateCalendar(int step)
    {
+      #pragma omp critical (_output)
+      {info(50) << "updateCalendar : before : " << calendar->getCurrentDate() << endl;}
       calendar->update(step);
-
-
+      #pragma omp critical (_output)
+      {info(50) << "updateCalendar : after : " << calendar->getCurrentDate() << endl;}
+#ifdef XIOS_MEMTRACK_LIGHT
+      #pragma omp critical (_output)
+      {info(50) << " Current memory used by XIOS : "<<  MemTrack::getCurrentMemorySize()*1.0/(1024*1024)<<" Mbyte, at timestep "<<step<<" of context "<<this->getId()<<endl ;}
+#endif
       if (hasClient)
       {
@@ -1255 +1273 @@
     CContext* context = CObjectFactory::CreateObject<CContext>(id).get();
     getRoot();
-    //if (!hasctxt) CGroupFactory::AddChild(root, context->getShared());
     if (!hasctxt) CGroupFactory::AddChild(*root_ptr, context->getShared());