Changeset 2287

Timestamp:

01/20/22 09:48:58 (2 years ago)

Author:

jderouillat

Message:

Fix for second level servers usage (nomenclature and recomment MPI_Win_free)

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• context_client.cpp (modified) (1 diff)
• context_server.cpp (modified) (1 diff)
• manager/contexts_manager.cpp (modified) (1 diff)
• manager/services.cpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/src/context_client.cpp

@@ -378 +378 @@
 // don't know when release windows
 
-      if (!isAttachedModeEnabled())
-      {  
-        for(auto& it : winComm_)
-        {
-          int rank = it.first ;
-          MPI_Win_free(&windows_[rank][0]);
-          MPI_Win_free(&windows_[rank][1]);
-          MPI_Comm_free(&winComm_[rank]) ;
-        }
-      } 
+      //if (!isAttachedModeEnabled())
+      //{  
+      //  for(auto& it : winComm_)
+      //  {
+      //    int rank = it.first ;
+      //    MPI_Win_free(&windows_[rank][0]);
+      //    MPI_Win_free(&windows_[rank][1]);
+      //    MPI_Comm_free(&winComm_[rank]) ;
+      //  }
+      //} 
    }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/context_server.cpp

@@ -418 +418 @@
   void CContextServer::freeWindows()
   {
-    if (!isAttachedModeEnabled())
-    {
-      for(auto& it : winComm_)
-      {
-        int rank = it.first ;
-        MPI_Win_free(&windows_[rank][0]);
-        MPI_Win_free(&windows_[rank][1]);
-        MPI_Comm_free(&winComm_[rank]) ;
-      }
-    }
+    //if (!isAttachedModeEnabled())
+    //{
+    //  for(auto& it : winComm_)
+    //  {
+    //    int rank = it.first ;
+    //    MPI_Win_free(&windows_[rank][0]);
+    //    MPI_Win_free(&windows_[rank][1]);
+    //    MPI_Comm_free(&winComm_[rank]) ;
+    //  }
+    //}
   }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/contexts_manager.cpp

@@ -204 +204 @@
       ostringstream oss;
       oss<<partitionId;
-      return poolId+"::"+serviceId+"_"+oss.str()+"::"+contextId;
+      return poolId+"__"+serviceId+"_"+oss.str()+"__"+contextId;
     }
   }

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/services.cpp

@@ -40 +40 @@
     ostringstream oss;
     oss<<partitionId;
-    name_= poolId+"::"+serviceId+"_"+oss.str();
+    name_= poolId+"__"+serviceId+"_"+oss.str();
   }