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

Timestamp:

05/28/18 09:54:32 (6 years ago)

Author:

yushan

Message:

save dev

File:

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

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

@@ -11 +11 @@
     *flag = false;
 
-    if(!comm.is_ep)
+    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);
+      ::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;
@@ -29 +29 @@
 
     #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)        
@@ -41 +41 @@
           *flag = true;
 
-          ::MPI_Status mpi_status = *(static_cast< ::MPI_Status *>(it->mpi_status));
+          ::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;
+          status->ep_src = (*it)->ep_src;
+          status->ep_tag = (*it)->ep_tag;
 
           break;
@@ -61 +61 @@
   {
     *flag = false;
-    if(!comm.is_ep)
+    if(!comm->is_ep)
     {
       Debug("calling MPI_Improbe MPI\n");
@@ -71 +71 @@
       #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;
+
+        //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;
+        bool tag_matched = tag<0? true: (*it)->ep_tag == tag;
         
         if(src_matched && tag_matched)
@@ -109 +113 @@
           *flag = true;
 
-          ::MPI_Status mpi_status;
-          mpi_status = *(static_cast< ::MPI_Status *>(it->mpi_status));
+          status->mpi_status = (*it)->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 = (*it)->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)
           {              
-            delete it->mpi_status;
-            comm.ep_comm_ptr->message_queue->erase(it);
+            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));
+            
+            delete (*it)->mpi_message;     
+            delete (*it)->mpi_status; 
+            delete *it;
+            
+            comm->ep_comm_ptr->message_queue->erase(it);
+            printf("message queue siez = %lu\n", comm->ep_comm_ptr->message_queue->size());
             #pragma omp flush
           }
-
+          
           break;
         }