Changeset 1503 for XIOS/dev/branch_openmp/extern/ep_dev/ep_message.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_message.cpp (modified) (11 diffs)

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

@@ -20 +20 @@
   int Request_Check()
   {
+    if(EP_PendingRequests == 0 ) EP_PendingRequests = new std::list< MPI_Request* >;
+    
+    if(EP_PendingRequests->size() == 0) return 0;
+    
     MPI_Status status;
     MPI_Message *message;
@@ -26 +30 @@
     std::list<MPI_Request* >::iterator it;
     
-    if(EP_PendingRequests == 0 ) return 0;
     
     for(it = EP_PendingRequests->begin(); it!=EP_PendingRequests->end(); it++)
@@ -38 +41 @@
       if((*(*it))->state == 0)
       {
-          
-        message = new MPI_Message;
-        *message = new ep_message;
-        
-        printf("new %p : in ep_lib::Request_Check, message = new MPI_Message\n", message);
-        printf("new %p : in ep_lib::Request_Check, *message = new ep_message\n", *message);
+        #pragma omp critical (_query0)
+        {
+          MPI_Iprobe((*(*it))->ep_src, (*(*it))->ep_tag, ((*(*it))->comm), &probed, &status);
+          if(probed)
+          {
+            message = new MPI_Message;
+            *message = new ep_message;
+        
+            memcheck("new "<< message <<" : in ep_lib::Request_Check, message = new MPI_Message");
+            memcheck("new "<< *message <<" : in ep_lib::Request_Check, *message = new ep_message");
           
           
-        MPI_Improbe((*(*it))->ep_src, (*(*it))->ep_tag, ((*(*it))->comm), &probed, message, &status);
-        printf("in Request_Check, after improbe, mpi_status = %p\n", to_mpi_status_ptr(status));
+            MPI_Improbe((*(*it))->ep_src, (*(*it))->ep_tag, (*(*it))->comm, &probed, message, &status);
+        
+          }
+        }
       
         
@@ -54 +63 @@
           ::MPI_Get_count(to_mpi_status_ptr(status), to_mpi_type((*(*it))->ep_datatype), &recv_count);
           
-          printf("in Request_Check, imrecv, buf = %p, recv_count = %d, status = %p\n", (*(*it))->buf, recv_count, to_mpi_status_ptr(status));
           MPI_Imrecv((*(*it))->buf, recv_count, (*(*it))->ep_datatype, message, *it);
           (*(*it))->type = 3;
           (*(*it))->state = 1;
-          
-
-          printf("delete %p : in ep_lib::Request_Check, delete *message\n", *message);
-          printf("delete %p : in ep_lib::Request_Check, delete message\n", message);
+
+          memcheck("delete "<< status.mpi_status <<" : in ep_lib::Request_Check, delete status.mpi_status");
+          delete status.mpi_status;          
+
+          memcheck("delete "<< *message <<" : in ep_lib::Request_Check, delete *message");
+          memcheck("delete "<< message <<" : in ep_lib::Request_Check, delete message");
 
           delete *message;
@@ -68 +78 @@
           it++;
           continue;      
-        }      
+        }              
       }
       
       if((*(*it))->state == 2)
       {
-        printf("delete %p : in ep_lib::Request_Check, delete (*(*it))\n", (*(*it)));
+        int ep_rank = ((*(*it))->comm)->ep_comm_ptr->size_rank_info[0].first;
+        memcheck("delete "<< (*(*it)) <<" : in ep_lib::Request_Check, delete (*(*it))");
         delete (*(*it));
         
         EP_PendingRequests->erase(it);
-        printf("EP_PendingRequests->size() = %lu\n", EP_PendingRequests->size());
+        memcheck("EP_PendingRequests["<<ep_rank<<"]->size() = " << EP_PendingRequests->size());
         it = EP_PendingRequests->begin();
         continue;
@@ -128 +139 @@
         msg->mpi_message = new ::MPI_Message(message);
 
-        printf("new %p : in ep_lib::Message_Check, msg = new ep_message\n", msg);
-        printf("new %p : in ep_lib::Message_Check, msg->mpi_message = new ::MPI_Message\n", msg->mpi_message);
+        memcheck("new "<< msg <<" : in ep_lib::Message_Check, msg = new ep_message");
+        memcheck("new "<< msg->mpi_message <<" : in ep_lib::Message_Check, msg->mpi_message = new ::MPI_Message");
               
 
@@ -139 +150 @@
         msg->ep_src  = get_ep_rank(comm, src_loc,  src_mpi);       
         msg->mpi_status = new ::MPI_Status(status);  
-        printf("new %p : in ep_lib::Message_Check, msg->mpi_status = new ::MPI_Status\n", msg->mpi_status);
+        memcheck("new "<< msg->mpi_status <<" : in ep_lib::Message_Check, msg->mpi_status = new ::MPI_Status");
 
         #pragma omp critical (_query)
@@ -145 +156 @@
           #pragma omp flush
           comm->ep_comm_ptr->comm_list[dest_loc]->ep_comm_ptr->message_queue->push_back(msg);  
-          int test_count;
-          ::MPI_Get_count(static_cast< ::MPI_Status* >(msg->mpi_status), 1275070475, &test_count);
-          printf("status1 = %p, test_count2 = %d\n", static_cast< ::MPI_Status* >(msg->mpi_status), test_count);
-          
-          ::MPI_Get_count(static_cast< ::MPI_Status* >(comm->ep_comm_ptr->comm_list[dest_loc]->ep_comm_ptr->message_queue->back()->mpi_status), 1275070475, &test_count);
-          printf("status2 = %p, test_count2 = %d\n", static_cast< ::MPI_Status* >(comm->ep_comm_ptr->comm_list[dest_loc]->ep_comm_ptr->message_queue->back()->mpi_status), test_count);
-                   
+          int dest_mpi = comm->ep_comm_ptr->size_rank_info[2].first;
+          memcheck("message_queue["<<dest_mpi<<","<<dest_loc<<"]->size = "<<comm->ep_comm_ptr->comm_list[dest_loc]->ep_comm_ptr->message_queue->size());
           #pragma omp flush
         }
@@ -199 +205 @@
         msg->mpi_message = new ::MPI_Message(message);
 
-        printf("new %p : in ep_lib::Message_Check, msg = new ep_message\n", msg);
-        printf("new %p : in ep_lib::Message_Check, msg->mpi_message = new ::MPI_Message\n", msg->mpi_message);
+        memcheck("new "<< msg <<" : in ep_lib::Message_Check, msg = new ep_message");
+        memcheck("new "<< msg->mpi_message <<" : in ep_lib::Message_Check, msg->mpi_message = new ::MPI_Message");
               
 
@@ -210 +216 @@
              
         msg->ep_src  = get_ep_rank(comm, src_loc,  src_mpi);       
-        msg->mpi_status = new ::MPI_Status(status);  
-        printf("new %p : in ep_lib::Message_Check, msg->mpi_status = new ::MPI_Status\n", msg->mpi_status);
+        msg->mpi_status = new ::MPI_Status(status); 
+        memcheck("new "<< msg->mpi_status <<" : in ep_lib::Message_Check, msg->mpi_status = new ::MPI_Status");
 
         #pragma omp critical (_query)
@@ -217 +223 @@
           #pragma omp flush
           comm->ep_comm_ptr->comm_list[dest_loc]->ep_comm_ptr->message_queue->push_back(msg);
+          memcheck("comm->ep_comm_ptr->comm_list["<<dest_loc<<"]->ep_comm_ptr->message_queue->size = "<<comm->ep_comm_ptr->comm_list[dest_loc]->ep_comm_ptr->message_queue->size());
           #pragma omp flush
         }