Changeset 2019 for XIOS/dev/dev_trunk_graph/src/context_client.hpp

Timestamp:

01/22/21 12:00:29 (3 years ago)

Author:

yushan

Message:

Graph intermedia commit to a tmp branch

File:

• XIOS/dev/dev_trunk_graph/src/context_client.hpp (modified) (7 diffs)

XIOS/dev/dev_trunk_graph/src/context_client.hpp

@@ -14 +14 @@
 {
   class CContext;
-
+  class CContextServer ;
   /*!
   \class CContextClient
@@ -31 +31 @@
       // Send event to server
       void sendEvent(CEventClient& event);
-      bool sendTemporarilyBufferedEvent();
       void waitEvent(list<int>& ranks);
+      void waitEvent_old(list<int>& ranks);
 
       // Functions to set/get buffers
-      bool getBuffers(const list<int>& serverList, const list<int>& sizeList, list<CBufferOut*>& retBuffers, bool nonBlocking = false);
+      bool getBuffers(const size_t timeLine, const list<int>& serverList, const list<int>& sizeList, list<CBufferOut*>& retBuffers, bool nonBlocking = false);
       void newBuffer(int rank);
       bool checkBuffers(list<int>& ranks);
@@ -47 +47 @@
       const std::list<int>& getRanksServerNotLeader(void) const;
 
-      bool isAttachedModeEnabled() const;
-      bool hasTemporarilyBufferedEvent() const { return !tmpBufferedEvent.isEmpty(); };
+  /*!
+   * Check if the attached mode is used.
+   *
+   * \return true if and only if attached mode is used
+   */
+      bool isAttachedModeEnabled() const { return isAttached_ ; } 
 
       static void computeLeader(int clientRank, int clientSize, int serverSize,
@@ -56 +60 @@
       // Close and finalize context client
 //      void closeContext(void);  Never been implemented.
+      bool isNotifiedFinalized(void) ;
       void finalize(void);
 
       void setBufferSize(const std::map<int,StdSize>& mapSize, const std::map<int,StdSize>& maxEventSize);
+
+      int getRemoteSize(void) {return serverSize;}
+      int getServerSize(void) {return serverSize;}
+      MPI_Comm getIntraComm(void)  {return intraComm ;} 
+      int getIntraCommSize(void) {return clientSize ;}
+      int getIntraCommRank(void) {return clientRank ;}
+
+      /*! set the associated server (dual chanel client/server) */      
+      void setAssociatedServer(CContextServer* associatedServer) { associatedServer=associatedServer_;}
+      /*! get the associated server (dual chanel client/server) */      
+      CContextServer* getAssociatedServer(void) { return associatedServer_;}
 
     public:
@@ -71 +87 @@
       int serverSize; //!< Size of server group
 
-      MPI_Comm interComm; //!< Communicator of server group
+      MPI_Comm interComm; //!< Communicator of server group (interCommunicator)
+
+      MPI_Comm interCommMerged; //!< Communicator of the client group + server group (intraCommunicator) needed for one sided communication.
 
       MPI_Comm intraComm; //!< Communicator of client group
 
+      MPI_Comm commSelf; //!< Communicator of the client alone. Needed to create a new communicator between 1 proc client and 1 proc server for one sided communication
+
       map<int,CClientBuffer*> buffers; //!< Buffers for connection to servers
 
+      bool pureOneSided ; //!< if true, client will communicated with servers only trough one sided communication. Otherwise the hybrid mode P2P /One sided is used.
+
     private:
+      void lockBuffers(list<int>& ranks) ;
+      void unlockBuffers(list<int>& ranks) ;
+      
       //! Mapping of server and buffer size for each connection to server
       std::map<int,StdSize> mapBufferSize_;
@@ -84 +109 @@
       //! Maximum number of events that can be buffered
       StdSize maxBufferedEvents;
-
-      struct {
-        std::list<int> ranks, sizes;
-        std::list<CBufferOut*> buffers;
-
-        bool isEmpty() const { return ranks.empty(); };
-        void clear() {
-          ranks.clear();
-          sizes.clear();
-
-          for (std::list<CBufferOut*>::iterator it = buffers.begin(); it != buffers.end(); it++)
-            delete *it;
-
-          buffers.clear();
-        };
-      } tmpBufferedEvent; //! Event temporarily buffered (used only on the server)
 
       //! Context for server (Only used in attached mode)
@@ -110 +119 @@
       std::list<int> ranksServerNotLeader;
 
+      std::vector<std::vector<MPI_Win> >windows ; //! one sided mpi windows to expose client buffers to servers == windows[nbServers][2]
+      bool isAttached_ ;
+      CContextServer* associatedServer_ ; //!< The server associated to the pair client/server
+
   };
 }