Changeset 1520 for XIOS/dev/branch_openmp/extern/src_ep_dev/ep_probe.cpp

Timestamp:

06/04/18 19:25:08 (6 years ago)

Author:

yushan

Message:

save dev. TO DO : test with xios

File:

• XIOS/dev/branch_openmp/extern/src_ep_dev/ep_probe.cpp (modified) (4 diffs)

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_probe.cpp

@@ -6 +6 @@
 namespace ep_lib
 {
+  int MPI_Iprobe_mpi(int src, int tag, MPI_Comm comm, int *flag, MPI_Status *status)
+  {
+    status->ep_src = src;
+    status->ep_tag = tag;
+    return ::MPI_Iprobe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm->mpi_comm), flag, to_mpi_status_ptr(*status));
+  }
 
   int MPI_Iprobe(int src, int tag, MPI_Comm comm, int *flag, MPI_Status *status)
   {
-    *flag = false;
+    if(!comm->is_ep)
+    {
+      Debug("MPI_Iprobe with MPI\n");
+      return MPI_Iprobe_mpi(src, tag, comm, flag, status);
+    }
+    
+    else
+    {
+      Debug("MPI_Iprobe with EP\n");
+      
+      *flag = false;
+    
+      Message_Check(comm);
 
-    if(!comm.is_ep)
-    {
-      ::MPI_Status *mpi_status = static_cast< ::MPI_Status* >(status->mpi_status);
-      ::MPI_Iprobe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm.mpi_comm), flag, mpi_status);
+      #pragma omp flush
 
-      status->mpi_status = mpi_status;
-      status->ep_src = src;
-      status->ep_tag = tag;
-      return 0;
-    }
-
-    Debug("calling MPI_Iprobe EP\n");
-
-    Message_Check(comm);
-
-    #pragma omp flush
-
-    #pragma omp critical (_query)
-    if(!comm.ep_comm_ptr->message_queue->empty())
-    {
-      for(Message_list::iterator it = comm.ep_comm_ptr->message_queue->begin(); it!= comm.ep_comm_ptr->message_queue->end(); ++it)
+      #pragma omp critical (_query)
+      for(Message_list::iterator it = comm->ep_comm_ptr->message_queue->begin(); it!= comm->ep_comm_ptr->message_queue->end(); ++it)
       {
-        bool src_matched = src<0? true: it->ep_src == src;
-        bool tag_matched = tag<0? true: it->ep_tag == tag;
+        bool src_matched = src<0? true: (*it)->ep_src == src;
+        bool tag_matched = tag<0? true: (*it)->ep_tag == tag;
         
         if(src_matched && tag_matched)        
         {
           Debug("find message\n");
+          
+
+          status->mpi_status = new ::MPI_Status(*static_cast< ::MPI_Status*>((*it)->mpi_status));
+          status->ep_src = (*it)->ep_src;
+          status->ep_tag = (*it)->ep_tag;
+
           *flag = true;
-
-          ::MPI_Status mpi_status = *(static_cast< ::MPI_Status *>(it->mpi_status));
-
-          status->mpi_status = new ::MPI_Status(mpi_status);
-          status->ep_src = it->ep_src;
-          status->ep_tag = it->ep_tag;
-
           break;
         }
-
       }
     }
-
-    return 0;
   }
 
@@ -60 +57 @@
   int MPI_Improbe(int src, int tag, MPI_Comm comm, int *flag, MPI_Message *message, MPI_Status *status)
   {
+    int ep_rank_loc = comm->ep_comm_ptr->size_rank_info[1].first;
+    int mpi_rank    = comm->ep_comm_ptr->size_rank_info[2].first;
     *flag = false;
-    if(!comm.is_ep)
+    if(!comm->is_ep)
     {
       Debug("calling MPI_Improbe MPI\n");
@@ -71 +70 @@
       #pragma omp critical (_mpi_call)
       {
-        ::MPI_Iprobe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm.mpi_comm), flag, &mpi_status);
+        ::MPI_Iprobe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm->mpi_comm), flag, &mpi_status);
         if(*flag)
         {
-          ::MPI_Mprobe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm.mpi_comm), &mpi_message, &mpi_status);
+          ::MPI_Mprobe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm->mpi_comm), &mpi_message, &mpi_status);
         }
       }
       #elif _intelmpi
-        ::MPI_Improbe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm.mpi_comm), flag, &mpi_message, &mpi_status);
+        ::MPI_Improbe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm->mpi_comm), flag, &mpi_message, &mpi_status);
       #endif
         
-      status->mpi_status = new ::MPI_Status(mpi_status);
+      status->mpi_status = &mpi_status;
       status->ep_src = src;
       status->ep_tag = tag;
 
-      message->mpi_message = new ::MPI_Message;
-      *(static_cast< ::MPI_Message*>(message->mpi_message)) = mpi_message;
-      message->ep_src = src;
-      message->ep_tag = tag;
+      (*message)->mpi_message = &message;
+      (*message)->ep_src = src;
+      (*message)->ep_tag = tag;
+      
+      
       return 0;
     }
 
-    
-    //Message_Check(comm);
+   
 
     #pragma omp flush
 
     #pragma omp critical (_query)
-    if(! comm.ep_comm_ptr->message_queue->empty())
+    if(! comm->ep_comm_ptr->message_queue->empty())
     {
-      for(Message_list::iterator it = comm.ep_comm_ptr->message_queue->begin(); it!= comm.ep_comm_ptr->message_queue->end(); ++it)
+      for(Message_list::iterator it = comm->ep_comm_ptr->message_queue->begin(); it!= comm->ep_comm_ptr->message_queue->end(); ++it)
       {
-        bool src_matched = src<0? true: it->ep_src == src;
-        bool tag_matched = tag<0? true: it->ep_tag == tag;
+                                          
+        bool src_matched = src<0? true: (*it)->ep_src == src;
+        bool tag_matched = tag<0? true: (*it)->ep_tag == tag;
         
         if(src_matched && tag_matched)
@@ -109 +109 @@
           *flag = true;
 
-          ::MPI_Status mpi_status;
-          mpi_status = *(static_cast< ::MPI_Status *>(it->mpi_status));
+          status->mpi_status = new ::MPI_Status(*static_cast< ::MPI_Status*>((*it)->mpi_status));
+          memcheck("new "<< status->mpi_status << " : in ep_lib::MPI_Improbe, status->mpi_status = new ::MPI_Status");
+          status->ep_src = (*it)->ep_src;
+          status->ep_tag = (*it)->ep_tag;
 
-          status->mpi_status = new ::MPI_Status(mpi_status);
-          status->ep_src = it->ep_src;
-          status->ep_tag = it->ep_tag;
-
-          message->mpi_message = it->mpi_message;
-          message->ep_tag = it->ep_tag;
-          message->ep_src = it->ep_src;
+          (*message)->mpi_message = new ::MPI_Message(*static_cast< ::MPI_Message*>((*it)->mpi_message));
+          memcheck("new "<< (*message)->mpi_message <<" : in ep_lib::MPI_Improbe, (*message)->mpi_message = new ::MPI_Message");
+          (*message)->ep_src = (*it)->ep_src;
+          (*message)->ep_tag = (*it)->ep_tag;
+                                      
 
           #pragma omp critical (_query2)
           {              
-            delete it->mpi_status;
-            comm.ep_comm_ptr->message_queue->erase(it);
+            memcheck("delete "<< (*it)->mpi_message <<" : in ep_lib::Message_Check, delete (*it)->mpi_message");
+            memcheck("delete "<< (*it)->mpi_status <<" : in ep_lib::Message_Check, delete (*it)->mpi_status");
+            memcheck("delete "<< (*it) <<" : in ep_lib::Message_Check, delete (*it)");
+            
+            
+            delete (*it)->mpi_message;     
+            delete (*it)->mpi_status; 
+            delete *it;
+            
+                       
+            comm->ep_comm_ptr->message_queue->erase(it);
+            memcheck("message_queue["<<mpi_rank<<","<<ep_rank_loc<<"]->size = "<<comm->ep_comm_ptr->message_queue->size());
             #pragma omp flush
           }
-
+          
           break;
         }