Changeset 595 for XIOS/trunk/src/node/domain.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/domain.cpp (modified) (2 diffs)

XIOS/trunk/src/node/domain.cpp

@@ -646 +646 @@
     CServerDistributionDescription serverDescription(nGlobDomain);
 
-    int ni_srv=ni_glo.getValue() ;
-    int ibegin_srv=0 ;
-    int iend_srv=ni_glo.getValue() ;
-
-    int nj_srv ;
-    int jbegin_srv ;
-    int jend_srv ;
-
-    CContext* context=CContext::getCurrent() ;
-    CContextClient* client=context->client ;
-    int nbServer=client->serverSize ;
-    int serverRank=client->getServerLeader() ;
-
-     serverDescription.computeServerDistribution(nbServer);
-     std::vector<std::vector<int> > serverIndexBegin = serverDescription.getServerIndexBegin();
-     std::vector<std::vector<int> > serverDimensionSizes = serverDescription.getServerDimensionSizes();
-     ibegin_srv = (serverIndexBegin[serverRank])[0];
-     jbegin_srv = serverIndexBegin[serverRank][1];
-     ni_srv = serverDimensionSizes[serverRank][0];
-     nj_srv = serverDimensionSizes[serverRank][1];
-     iend_srv = ibegin_srv+ni_srv-1;
-     jend_srv = jbegin_srv+nj_srv-1;
-
-     CEventClient event(getType(),EVENT_ID_SERVER_ATTRIBUT) ;
-     if (client->isServerLeader())
-     {
-       CMessage msg ;
-       msg<<this->getId() ;
-       msg<<ni_srv<<ibegin_srv<<iend_srv<<nj_srv<<jbegin_srv<<jend_srv;
-       event.push(client->getServerLeader(),1,msg) ;
-       client->sendEvent(event) ;
-     }
-     else client->sendEvent(event) ;
+    CContext* context = CContext::getCurrent();
+    CContextClient* client = context->client;
+    int nbServer = client->serverSize;
+
+    serverDescription.computeServerDistribution(nbServer);
+    std::vector<std::vector<int> > serverIndexBegin = serverDescription.getServerIndexBegin();
+    std::vector<std::vector<int> > serverDimensionSizes = serverDescription.getServerDimensionSizes();
+
+    CEventClient event(getType(),EVENT_ID_SERVER_ATTRIBUT);
+    if (client->isServerLeader())
+    {
+      std::list<CMessage> msgs;
+
+      const std::list<int>& ranks = client->getRanksServerLeader();
+      for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
+      {
+        // Use const int to ensure CMessage holds a copy of the value instead of just a reference
+        const int ibegin_srv = serverIndexBegin[*itRank][0];
+        const int jbegin_srv = serverIndexBegin[*itRank][1];
+        const int ni_srv = serverDimensionSizes[*itRank][0];
+        const int nj_srv = serverDimensionSizes[*itRank][1];
+        const int iend_srv = ibegin_srv + ni_srv - 1;
+        const int jend_srv = jbegin_srv + nj_srv - 1;
+
+        msgs.push_back(CMessage());
+        CMessage& msg = msgs.back();
+        msg << this->getId() ;
+        msg << ni_srv << ibegin_srv << iend_srv << nj_srv << jbegin_srv << jend_srv;
+
+        event.push(*itRank,1,msg);
+      }
+      client->sendEvent(event);
+    }
+    else client->sendEvent(event);
   }
 
@@ -921 +922 @@
   void CDomain::recvServerAttribut(CBufferIn& buffer)
   {
-    int zoom_iend=zoom_ibegin.getValue()+zoom_ni.getValue()-1 ;
-    int zoom_jend=zoom_jbegin.getValue()+zoom_nj.getValue()-1 ;
-
-     buffer>>ni_srv>>ibegin_srv>>iend_srv>>nj_srv>>jbegin_srv>>jend_srv;
-
+    int zoom_iend = zoom_ibegin.getValue() + zoom_ni.getValue() - 1;
+    int zoom_jend = zoom_jbegin.getValue() + zoom_nj.getValue() - 1;
+
+    buffer >> ni_srv >> ibegin_srv >> iend_srv >> nj_srv >> jbegin_srv >> jend_srv;
 
     zoom_ibegin_srv = zoom_ibegin.getValue() > ibegin_srv ? zoom_ibegin.getValue() : ibegin_srv ;