Changeset 1063 for XIOS/dev/branch_yushan/extern/src_ep_dev/ep_free.cpp

Timestamp:

02/27/17 14:19:19 (7 years ago)

Author:

yushan

Message:

server mode OK for both multiple and one file mode. Tested with test_client

File:

• XIOS/dev/branch_yushan/extern/src_ep_dev/ep_free.cpp (modified) (8 diffs)

XIOS/dev/branch_yushan/extern/src_ep_dev/ep_free.cpp

@@ -10 +10 @@
   int MPI_Comm_free(MPI_Comm *comm)
   {
-    //if(comm == NULL) return 0;
-
-    MPI_Barrier(*comm);
-
 
     if(! comm->is_ep)
@@ -27 +23 @@
     }
 
+    else if(comm->is_intercomm)
+    {
+      return MPI_Comm_free_intercomm(comm);
+    }
+
     else
     {
-      if(comm->mpi_comm == MPI_COMM_NULL_STD ) return 0;
+      int ep_rank_loc, num_ep;
 
-      int ep_rank, ep_rank_loc, mpi_rank;
-      int ep_size, num_ep, mpi_size;
-
-      ep_rank = comm->ep_comm_ptr->size_rank_info[0].first;
       ep_rank_loc = comm->ep_comm_ptr->size_rank_info[1].first;
-      mpi_rank = comm->ep_comm_ptr->size_rank_info[2].first;
-      ep_size = comm->ep_comm_ptr->size_rank_info[0].second;
       num_ep = comm->ep_comm_ptr->size_rank_info[1].second;
-      mpi_size = comm->ep_comm_ptr->size_rank_info[2].second;
 
       MPI_Barrier(*comm);
-
-
-      #pragma omp critical (memory_free)
-      if(comm->is_intercomm && comm->ep_comm_ptr->intercomm != NULL)
-      {
-        if(comm->ep_comm_ptr->intercomm->local_rank_map) comm->ep_comm_ptr->intercomm->local_rank_map->clear();
-        if(comm->ep_comm_ptr->intercomm->remote_rank_map) comm->ep_comm_ptr->intercomm->remote_rank_map->clear();
-        if(comm->ep_comm_ptr->intercomm->intercomm_rank_map) comm->ep_comm_ptr->intercomm->intercomm_rank_map->clear();
-        Debug("intercomm local/remote/intercomm_rank_map emptied\n");
-      }
-
 
       if(ep_rank_loc == 0)
@@ -58 +41 @@
         Debug("comm is EP, mpi_comm_ptr != NULL\n");
 
-
-/*
         if(comm->my_buffer != NULL)
         {
@@ -69 +50 @@
           if(comm->my_buffer->buf_char != NULL) delete[] comm->my_buffer->buf_char; Debug("buf_char freed\n");
         }
-*/
+
         if(comm->ep_barrier != NULL)
         {
@@ -77 +58 @@
 
 
-        if(comm->rank_map != NULL)
+        if( ! comm->rank_map->empty() )
         {
           comm->rank_map->clear();
@@ -83 +64 @@
         }
 
-
-        if(comm->is_intercomm && comm->ep_comm_ptr->intercomm->mpi_inter_comm != MPI_COMM_NULL_STD)
-        {
-          ::MPI_Comm mpi_comm = static_cast< ::MPI_Comm>(comm->ep_comm_ptr->intercomm->mpi_inter_comm);
-
-          ::MPI_Comm_free(&mpi_comm);
-          //comm->ep_comm_ptr->intercomm->mpi_inter_comm = NULL;
-          Debug("mpi_intercomm freed\n");
-        }
-
-
-
         for(int i=0; i<num_ep; i++)
         {
-          if(comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->message_queue != NULL)
-          {
-            comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->message_queue->clear();
-            Debug("message queue freed\n");
-          }
+          comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->message_queue->clear();
+          Debug("message queue freed\n");
+          
 
           if(comm->ep_comm_ptr->comm_list[i].ep_comm_ptr != NULL)
@@ -114 +81 @@
           ::MPI_Comm mpi_comm = static_cast< ::MPI_Comm>(comm->mpi_comm);
           ::MPI_Comm_free(&mpi_comm);
-          //comm->mpi_comm = NULL;
-//          printf("label = %d, mpi_comm freed\n", comm->ep_comm_ptr->comm_label);
+          Debug("mpi_comm freed\n");
         }
 
@@ -128 +94 @@
   }
 
+  int MPI_Comm_free_intercomm(MPI_Comm *comm)
+  {
+    int ep_rank_loc, num_ep;
+
+    ep_rank_loc = comm->ep_comm_ptr->size_rank_info[1].first;
+    num_ep = comm->ep_comm_ptr->size_rank_info[1].second;
+
+    //MPI_Barrier(*comm);
+
+    if(ep_rank_loc == 0)
+    {
+      Debug("comm is EP, mpi_comm_ptr != NULL\n");
+
+      if(comm->my_buffer != NULL)
+      {
+        if(comm->my_buffer->buf_int != NULL) delete[] comm->my_buffer->buf_int; Debug("buf_int freed\n");
+        if(comm->my_buffer->buf_float != NULL) delete[] comm->my_buffer->buf_float; Debug("buf_float freed\n");
+        if(comm->my_buffer->buf_double != NULL) delete[] comm->my_buffer->buf_double; Debug("buf_double freed\n");
+        if(comm->my_buffer->buf_long != NULL) delete[] comm->my_buffer->buf_long; Debug("buf_long freed\n");
+        if(comm->my_buffer->buf_ulong != NULL) delete[] comm->my_buffer->buf_ulong; Debug("buf_ulong freed\n");
+        if(comm->my_buffer->buf_char != NULL) delete[] comm->my_buffer->buf_char; Debug("buf_char freed\n");
+      }
+
+      if(comm->ep_barrier != NULL)
+      {
+        comm->ep_barrier->~OMPbarrier();
+        Debug("ep_barrier freed\n");
+      }
+
+
+      if( ! comm->rank_map->empty() )
+      {
+        comm->rank_map->clear();
+        Debug("rank_map emptied\n");
+      }
+
+      for(int i=0; i<num_ep; i++)
+      {
+        comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->message_queue->clear();
+        Debug("message queue freed\n");
+
+        #pragma omp critical (memory_free)
+        if(comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm != NULL)
+        {
+          comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->local_rank_map->clear();
+          comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->remote_rank_map->clear();
+          comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->intercomm_rank_map->clear();
+          Debug("intercomm local/remote/intercomm_rank_map emptied\n");
+        }  
+
+        if(comm->ep_comm_ptr->comm_list[i].ep_comm_ptr != NULL)
+        {
+          delete comm->ep_comm_ptr->comm_list[i].ep_comm_ptr;
+          Debug("ep_comm_ptr freed\n");
+        }
+      }
+
+      if(comm->mpi_comm != MPI_COMM_NULL_STD)
+      {
+        ::MPI_Comm mpi_comm = static_cast< ::MPI_Comm>(comm->mpi_comm);
+        ::MPI_Comm_free(&mpi_comm);
+        Debug("mpi_comm freed\n");
+      }
+
+      // if(comm->ep_comm_ptr->intercomm->mpi_inter_comm != MPI_COMM_NULL_STD)
+      // {
+         // ::MPI_Comm mpi_comm = static_cast< ::MPI_Comm>(comm->ep_comm_ptr->comm_list->ep_comm_ptr->intercomm->mpi_inter_comm);
+         // ::MPI_Comm_free(&mpi_comm);
+      //   Debug("mpi_intercomm freed\n");
+      // }
+
+     if(comm != NULL) {delete[] comm->ep_comm_ptr->comm_list; Debug("comm freed\n");}
+
+    }
+    
+    return 0;
+  }