Changeset 1503 for XIOS/dev/branch_openmp/extern/ep_dev/ep_probe.cpp

Timestamp:

05/28/18 17:28:07 (6 years ago)

Author:

yushan

Message:

rank_map is passed from vector to map, in order to have more flexibility in comm_split

File:

• XIOS/dev/branch_openmp/extern/ep_dev/ep_probe.cpp (modified) (8 diffs)

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

@@ -13 +13 @@
     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);
+      Debug("calling MPI_Iprobe MPI\n");
+      ::MPI_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);
 
-      status->mpi_status = mpi_status;
+      status->mpi_status = &mpi_status;
       status->ep_src = src;
       status->ep_tag = tag;
@@ -23 +24 @@
 
     Debug("calling MPI_Iprobe EP\n");
-
     Message_Check(comm);
 
@@ -43 +43 @@
           ::MPI_Status mpi_status = *(static_cast< ::MPI_Status *>((*it)->mpi_status));
 
-          status->mpi_status = new ::MPI_Status(mpi_status);
+          status->mpi_status = (*it)->mpi_status;
           status->ep_src = (*it)->ep_src;
           status->ep_tag = (*it)->ep_tag;
@@ -49 +49 @@
           break;
         }
-
       }
     }
@@ -60 +59 @@
   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)
@@ -102 +103 @@
       for(Message_list::iterator it = comm->ep_comm_ptr->message_queue->begin(); it!= comm->ep_comm_ptr->message_queue->end(); ++it)
       {
-
-        //printf("in ep_lib::Improbe, it->mpi_message = %p, it->mpi_status = %p, it->ep_src = %d, it->ep_tag = %d\n", 
-        //                            (*(*it))->mpi_message,(*(*it))->mpi_status,(*(*it))->ep_src,(*(*it))->ep_tag);
                                           
         bool src_matched = src<0? true: (*it)->ep_src == src;
@@ -113 +111 @@
           *flag = true;
 
-          status->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;
 
-          (*message)->mpi_message = (*it)->mpi_message;
+          (*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;
-          
-          int test_count;
-          ::MPI_Get_count(to_mpi_status_ptr(status), 1275070475, &test_count);
-          printf("status = %p, test_count = %d\n", to_mpi_status_ptr(status), test_count);
-          
-          
-          ::MPI_Get_count(static_cast< ::MPI_Status* >(comm->ep_comm_ptr->message_queue->back()->mpi_status), 1275070475, &test_count);
-          printf("in ep_lib::Improbe, status = %p, test_count = %d\n", static_cast< ::MPI_Status* >(comm->ep_comm_ptr->message_queue->back()->mpi_status), test_count);
                                       
 
           #pragma omp critical (_query2)
           {              
-            printf("delete %p : in ep_lib::Message_Check, delete (*it)->mpi_message\n", (*it)->mpi_message);
-            printf("delete %p : in ep_lib::Message_Check, delete (*it)->mpi_status\n", (*it)->mpi_status);
-            printf("delete %p : in ep_lib::Message_Check, delete (*it)\n", (*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;     
@@ -140 +133 @@
             delete *it;
             
+                       
             comm->ep_comm_ptr->message_queue->erase(it);
-            printf("message queue siez = %lu\n", comm->ep_comm_ptr->message_queue->size());
+            memcheck("message_queue["<<mpi_rank<<","<<ep_rank_loc<<"]->size = "<<comm->ep_comm_ptr->message_queue->size());
             #pragma omp flush
           }