Changeset 720 for XIOS/trunk/src/client_server_mapping_distributed.cpp

Timestamp:

10/06/15 17:17:10 (9 years ago)

Author:

mhnguyen

Message:

First implementation of hierarchical distributed hashed table

+) Implement dht for int with index of type size_t

Test
+) Local
+) Work correctly

File:

• XIOS/trunk/src/client_server_mapping_distributed.cpp (modified) (11 diffs)

XIOS/trunk/src/client_server_mapping_distributed.cpp

@@ -12 +12 @@
 #include <boost/functional/hash.hpp>
 #include "utils.hpp"
+#include "client_client_dht.hpp"
+#include "mpi_tag.hpp"
 
 namespace xios
@@ -19 +21 @@
                                                                  const MPI_Comm& clientIntraComm, bool isDataDistributed)
   : CClientServerMapping(), indexClientHash_(), countIndexGlobal_(0), countIndexServer_(0),
-    indexGlobalBuffBegin_(), indexServerBuffBegin_(), requestRecvIndexServer_(), isDataDistributed_(isDataDistributed)
+    indexGlobalBuffBegin_(), indexServerBuffBegin_(), requestRecvIndexServer_(), isDataDistributed_(isDataDistributed),
+    ccDHT_(0)
 {
   clientIntraComm_ = clientIntraComm;
@@ -25 +28 @@
   MPI_Comm_rank(clientIntraComm,&clientRank_);
   computeHashIndex();
-  computeDistributedServerIndex(globalIndexOfServer, clientIntraComm);
+
+  ccDHT_ = new CClientClientDHT(globalIndexOfServer,
+                                clientIntraComm,
+                                isDataDistributed);
+//  const boost::unordered_map<size_t,int>& globalIndexToServerMappingTmp = clientDht.getGlobalIndexServerMapping();
+//  globalIndexToServerMapping_ = clientDht.getGlobalIndexServerMapping();
+
+
+
+//  computeDistributedServerIndex(globalIndexOfServer, clientIntraComm);
 }
 
 CClientServerMappingDistributed::~CClientServerMappingDistributed()
 {
+  if (0 != ccDHT_) delete ccDHT_;
 }
 
@@ -38 +51 @@
 void CClientServerMappingDistributed::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient)
 {
+  ccDHT_->computeServerIndexMapping(globalIndexOnClient);
+  indexGlobalOnServer_ = ccDHT_->getGlobalIndexOnServer();
+
+/*
   size_t ssize = globalIndexOnClient.numElements(), hashedIndex;
 
@@ -177 +194 @@
   delete [] sendBuff;
   delete [] recvBuff;
+*/
 }
 
@@ -348 +366 @@
 
   // Probing for global index
-  MPI_Iprobe(MPI_ANY_SOURCE, 15, clientIntraComm_, &flagIndexGlobal, &statusIndexGlobal);
+  MPI_Iprobe(MPI_ANY_SOURCE, MPI_DHT_INDEX_0, clientIntraComm_, &flagIndexGlobal, &statusIndexGlobal);
   if ((true == flagIndexGlobal) && (countIndexGlobal_ < recvNbIndexCount))
   {
@@ -354 +372 @@
     indexGlobalBuffBegin_.insert(std::make_pair<int, unsigned long*>(statusIndexGlobal.MPI_SOURCE, recvIndexGlobalBuff+countIndexGlobal_));
     MPI_Irecv(recvIndexGlobalBuff+countIndexGlobal_, count, MPI_UNSIGNED_LONG,
-              statusIndexGlobal.MPI_SOURCE, 15, clientIntraComm_,
+              statusIndexGlobal.MPI_SOURCE, MPI_DHT_INDEX_0, clientIntraComm_,
               &requestRecvIndexGlobal_[statusIndexGlobal.MPI_SOURCE]);
     countIndexGlobal_ += count;
@@ -373 +391 @@
 
   // Probing for server index
-  MPI_Iprobe(MPI_ANY_SOURCE, 12, clientIntraComm_, &flagIndexServer, &statusIndexServer);
+  MPI_Iprobe(MPI_ANY_SOURCE, MPI_DHT_INFO_0, clientIntraComm_, &flagIndexServer, &statusIndexServer);
   if ((true == flagIndexServer) && (countIndexServer_ < recvNbIndexCount))
   {
@@ -379 +397 @@
     indexServerBuffBegin_.insert(std::make_pair<int, int*>(statusIndexServer.MPI_SOURCE, recvIndexServerBuff+countIndexServer_));
     MPI_Irecv(recvIndexServerBuff+countIndexServer_, count, MPI_INT,
-              statusIndexServer.MPI_SOURCE, 12, clientIntraComm_,
+              statusIndexServer.MPI_SOURCE, MPI_DHT_INFO_0, clientIntraComm_,
               &requestRecvIndexServer_[statusIndexServer.MPI_SOURCE]);
 
@@ -400 +418 @@
   requestSendIndexGlobal.push_back(request);
   MPI_Isend(&(indexGlobal)[0], (indexGlobal).size(), MPI_UNSIGNED_LONG,
-            clientDestRank, 15, clientIntraComm, &(requestSendIndexGlobal.back()));
+            clientDestRank, MPI_DHT_INDEX_0, clientIntraComm, &(requestSendIndexGlobal.back()));
 }
 
@@ -417 +435 @@
   requestSendIndexServer.push_back(request);
   MPI_Isend(&(indexServer)[0], (indexServer).size(), MPI_INT,
-            clientDestRank, 12, clientIntraComm, &(requestSendIndexServer.back()));
+            clientDestRank, MPI_DHT_INFO_0, clientIntraComm, &(requestSendIndexServer.back()));
 }