Changeset 830 for XIOS/trunk/src/client_client_dht_template.hpp

Timestamp:

03/23/16 16:11:06 (8 years ago)

Author:

mhnguyen

Message:

Implementing pack and unpack function for generic type of dht

+) Replace union with the more generic function for packing data into buffer and unpacking data from buffer
+) Change PairIntInt? from struct to std::pair<int,int>

Test
+) On Curie
+) All tests pass

File:

• XIOS/trunk/src/client_client_dht_template.hpp (modified) (5 diffs)

XIOS/trunk/src/client_client_dht_template.hpp

@@ -16 +16 @@
 #include "policy.hpp"
 #include <boost/unordered_map.hpp>
-//#include "utils.hpp"
 #include "dht_data_types.hpp"
 
@@ -39 +38 @@
 
   public:
-    /** Default constructor */
     CClientClientDHTTemplate(const Index2InfoTypeMap& indexInfoInitMap,
                              const MPI_Comm& clientIntraComm,
@@ -46 +44 @@
     void computeIndexInfoMapping(const CArray<size_t,1>& indices);
 
-    const Index2InfoTypeMap& getInfoIndexMap() const {return infoIndexMapping_; }
+    const Index2InfoTypeMap& getInfoIndexMap() const {return indexToInfoMappingLevel_; }
 
     /** Default destructor */
@@ -74 +72 @@
                                      const int recvNbIndexCount,
                                      int& countIndexServer,
-                                     std::map<int, unsigned char*>& indexServerBuffBegin,
+                                     std::map<int, unsigned char*>& infoBuffBegin,
                                      std::map<int, MPI_Request>& requestRecvIndexServer,
                                      const MPI_Comm& intraComm);
 
-    // Send server index to clients
-    void sendInfoToClients(int clientDestRank, std::vector<InfoType>& indexServer,
+    // Send information to clients
+    void sendInfoToClients(int clientDestRank, unsigned char* info, int infoSize,
                            const MPI_Comm& clientIntraComm, std::list<MPI_Request>& requestSendIndexServer);
 
@@ -99 +97 @@
     Index2InfoTypeMap index2InfoMapping_;
 
-    //! A temporary mapping of index to the corresponding information in each level of hierarchy
+    //! A mapping of index to the corresponding information in each level of hierarchy
     Index2InfoTypeMap indexToInfoMappingLevel_;
-
-    //! Data (information) corresponding to global index
-    Index2InfoTypeMap infoIndexMapping_;
 
     //! intracommuntion of clients