Changeset 595 for XIOS/trunk/src/node/context.cpp

Timestamp:

05/26/15 16:13:46 (9 years ago)

Author:

rlacroix

Message:

Allow using more servers than clients.

This will be useful later when implementing server to client communications.

File:

• XIOS/trunk/src/node/context.cpp (modified) (7 diffs)

XIOS/trunk/src/node/context.cpp

@@ -241 +241 @@
      if (hasClient)
      {
-       size_t bufferSizeMin = 10*sizeof(size_t)*1024;
+       size_t bufferSizeMin = 10 * sizeof(size_t) * 1024;
 #define DECLARE_NODE(Name_, name_)    \
-   bufferSizeMin = (bufferSizeMin < sizeof(C##Name_##Definition)) ?  sizeof(C##Name_##Definition) : bufferSizeMin;
+       bufferSizeMin = (bufferSizeMin < sizeof(C##Name_##Definition)) ?  sizeof(C##Name_##Definition) : bufferSizeMin;
 #define DECLARE_NODE_PAR(Name_, name_)
 #include "node_type.conf"
@@ -251 +251 @@
          if (client->isServerLeader())
          {
-           bufferSize[client->getServerLeader()] = bufferSizeMin;
+           const std::list<int>& ranks = client->getRanksServerLeader();
+           for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
+             bufferSize[*itRank] = bufferSizeMin;
          }
          else
           return;
        }
-
-       std::map<int, StdSize>::iterator  it = bufferSize.begin(),
-                                        ite = bufferSize.end();
-       for (; it != ite; ++it)
-       it->second = (it->second < bufferSizeMin) ? bufferSizeMin : it->second;
+       else
+       {
+         std::map<int, StdSize>::iterator it  = bufferSize.begin(),
+                                          ite = bufferSize.end();
+         for (; it != ite; ++it)
+           it->second = (it->second < bufferSizeMin) ? bufferSizeMin : it->second;
+       }
+
        client->setBufferSize(bufferSize);
      }
@@ -513 +518 @@
        CMessage msg;
        msg<<this->getIdServer();
-       event.push(client->getServerLeader(),1,msg);
+       const std::list<int>& ranks = client->getRanksServerLeader();
+       for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
+         event.push(*itRank,1,msg);
        client->sendEvent(event);
      }
@@ -539 +546 @@
          CMessage msg;
          msg<<this->getIdServer()<<step;
-         event.push(client->getServerLeader(),1,msg);
+         const std::list<int>& ranks = client->getRanksServerLeader();
+         for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
+           event.push(*itRank,1,msg);
          client->sendEvent(event);
        }
@@ -549 +558 @@
    void CContext::recvUpdateCalendar(CEventServer& event)
    {
-
       CBufferIn* buffer=event.subEvents.begin()->buffer;
       string id;
@@ -572 +580 @@
        CMessage msg;
        msg<<this->getIdServer();
-       event.push(client->getServerLeader(),1,msg);
+       const std::list<int>& ranks = client->getRanksServerLeader();
+       for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
+         event.push(*itRank,1,msg) ;
        client->sendEvent(event);
      }
@@ -603 +613 @@
          CMessage msg;
          msg<<this->getIdServer();
-         event.push(client->getServerLeader(),1,msg);
+         const std::list<int>& ranks = client->getRanksServerLeader();
+         for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
+           event.push(*itRank,1,msg);
          client->sendEvent(event);
        }