Changeset 1021 for XIOS/dev/dev_olga/src/client.cpp

Timestamp:

01/10/17 14:36:29 (7 years ago)

Author:

oabramkina

Message:

Intermeadiate version for merging with new server functionalities.

File:

• XIOS/dev/dev_olga/src/client.cpp (modified) (6 diffs)

XIOS/dev/dev_olga/src/client.cpp

@@ -57 +57 @@
 
           unsigned long hashClient = hashString(codeId) ;
-          unsigned long hashServer = hashString(CXios::xiosCodeIdPrm);
+          unsigned long hashServer = hashString(CXios::xiosCodeId);
+//          unsigned long hashServer = hashString(CXios::xiosCodeIdPrm);
           unsigned long* hashAll ;
           int size ;
@@ -88 +89 @@
           for (i=0; i < size; ++i)
           {
-            if ((hashAll[i] == hashString(CXios::xiosCodeId))
-                || (hashAll[i] == hashString(CXios::xiosCodeIdPrm))
-                || (hashAll[i] == hashString(CXios::xiosCodeIdSnd)))
+            if (hashAll[i] == hashString(CXios::xiosCodeId))
+//                || (hashAll[i] == hashString(CXios::xiosCodeIdPrm))
+//                || (hashAll[i] == hashString(CXios::xiosCodeIdSnd)))
             {
               CXios::setUsingServer();
@@ -103 +104 @@
           {
             int clientLeader=leaders[hashClient] ;
-//            serverLeader=leaders[hashServer] ;
             serverLeader.push_back(leaders[hashServer]) ;
             int intraCommSize, intraCommRank ;
@@ -111 +111 @@
                    <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< serverLeader.back()<<endl ;
              MPI_Intercomm_create(intraComm, 0, CXios::globalComm, serverLeader.back(), 0, &interComm) ;
-//             info(50)<<"intercommCreate::client "<<rank<<" intraCommSize : "<<intraCommSize
-//                    <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< serverLeader<<endl ;
-//              MPI_Intercomm_create(intraComm,0,CXios::globalComm,serverLeader,0,&interComm) ;
           }
           else
@@ -181 +178 @@
 /*!
  * \fn void CClient::registerContext(const string& id, MPI_Comm contextComm)
- * Function creates intraComm (CClient::intraComm) for client group with id=codeId and interComm (CClient::interComm) between client and server groups.
+ * \brief Sends a request to create a context to server. Creates client/server contexts.
  * \param [in] id id of context.
  * \param [in] contextComm.
+ * Function is only called by client.
  */
     void CClient::registerContext(const string& id, MPI_Comm contextComm)
@@ -250 +248 @@
     }
 
-    ///---------------------------------------------------------------
-    /*!
-     * \fn void CClient::registerContext(const string& id, const int poolNb, MPI_Comm contextComm)
-     * Function creates intraComm (CClient::intraComm) for client group with id=codeId and interComm (CClient::interComm) between client and server groups.
-     * \param [in] id id of context.
-     * \param [in] contextComm.
-     */
-        void CClient::registerContextOnSrvPools(const string& id, MPI_Comm contextComm)
+///---------------------------------------------------------------
+/*!
+  * \fn void CClient::registerContextByClienOfServer(const string& id, MPI_Comm contextComm)
+  * \brief Sends a request to create contexts on secondary servers. Creates clientPrimServer/serverPrimServer contexts.
+  * \param [in] id id of context.
+  * \param [in] contextComm.
+  * Function is called by primary server.
+  * The only difference with CClient::registerContext() is naming of contexts on servers (appearing of pool id at the end).
+  */
+        void CClient::registerContextByClienOfServer(const string& id, MPI_Comm contextComm)
         {
           CContext::setCurrent(id) ;