Changeset 2576

Timestamp:

09/19/23 09:51:42 (8 months ago)

Author:

ymipsl

Message:

Implement tracking of unfree communicators.

YM

Location:

XIOS3/trunk/src

Files:

• client.cpp (modified) (1 diff)
• mpi.hpp (modified) (1 diff)
• mpi_tools.cpp (modified) (1 diff)
• mpi_tools.hpp (modified) (2 diffs)
• server.cpp (modified) (1 diff)

XIOS3/trunk/src/client.cpp

@@ -521 +521 @@
 
       CXios::getMpiGarbageCollector().release() ; // release unfree MPI ressources
+      CCommTrack::dumpComm() ;
       if (!is_MPI_Initialized)
       {

XIOS3/trunk/src/mpi.hpp

@@ -31 +31 @@
 #include "mpi_tools.hpp"
 
+inline int MPI_Comm_dup(MPI_Comm comm, MPI_Comm * newcomm)
+{
+  int ret=PMPI_Comm_dup(comm, newcomm) ;
+  xios::CCommTrack::registerComm(*newcomm) ;
+  return ret ;
+}
+
+inline int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader,
+                         MPI_Comm peer_comm, int remote_leader, int tag, MPI_Comm * newintercomm)
+{
+  int ret=PMPI_Intercomm_create(local_comm, local_leader, peer_comm, remote_leader, tag, newintercomm) ;
+  xios::CCommTrack::registerComm(*newintercomm) ;
+  return ret ;
+}
+
+inline int MPI_Intercomm_merge(MPI_Comm intercomm, int high, MPI_Comm * newintracomm)
+{
+  int ret=PMPI_Intercomm_merge(intercomm, high, newintracomm) ;
+  xios::CCommTrack::registerComm(*newintracomm) ;
+  return ret ;
+}
+
+inline int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm * newcomm)
+{
+  int ret=PMPI_Comm_split(comm, color, key,newcomm) ;
+  xios::CCommTrack::registerComm(*newcomm) ;
+  return ret ;
+}
+
+inline int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm)
+{
+  int ret=PMPI_Comm_create(comm, group, newcomm) ;
+  xios::CCommTrack::registerComm(*newcomm) ;
+  return ret ;
+}
+
+inline int MPI_Comm_free(MPI_Comm *comm) 
+{ 
+  xios::CCommTrack::releaseComm(*comm) ;
+  return PMPI_Comm_free(comm) ;
+}
+
+
 #endif

XIOS3/trunk/src/mpi_tools.cpp

@@ -1 +1 @@
 #include "mpi.hpp"
-#include "mpi_tools.hpp"
-
-
+#include "backtrace.hpp"
+#include "exception.hpp"
+#include "log.hpp"
 #include <string>
+#include <sstream>
 
 namespace xios  
 {
+  std::map<MPI_Comm,string> CCommTrack::commTrack_ ;
+  void CCommTrack::registerComm(const MPI_Comm& comm)
+  {
+    auto it = commTrack_.find(comm) ;
+    if (it == commTrack_.end())  commTrack_[comm] = MemTrack::backTrace(3);
+    else ERROR("CCommtrack::registerComm", << "Communicator already allocated : " << endl<<it->second)
+  }
+
+  void CCommTrack::releaseComm(const MPI_Comm& comm)
+  {
+    auto it = commTrack_.find(comm) ;
+    if (it == commTrack_.end())  ERROR("CCommtrack::releaseComm", << "Communicator not allocated : " << endl)
+    else commTrack_.erase(it) ;
+  }
+
+  void CCommTrack::dumpComm(void)
+  {
+    ostringstream ostr ;
+    ostr<<" LIST of UNFREED MPI COMMUNICATORS"<<endl ;
+    for(auto& it : commTrack_ )
+    {
+      ostr<<"---------------------------"<<endl ;
+      ostr<<" -- unfreed communicator --"<<endl ;
+      ostr<<" --       backtrace      --"<<endl ;
+      ostr<<it.second<<endl ;
+    }
+    info(100)<<ostr.str() ;
+  }
+
   int MPI_Bcast_string(std::string& str, int root, MPI_Comm comm) 
   {

XIOS3/trunk/src/mpi_tools.hpp

@@ -3 +3 @@
 
 #include <string>
+#include <map>
 
 namespace xios
@@ -33 +34 @@
   MPI_Datatype MPI_GetType<long double>(void);
 
+  class CCommTrack
+  {
+    private:
+    static std::map<MPI_Comm,std::string> commTrack_ ;
+    
+    public:
+    static void registerComm(const MPI_Comm& comm) ;
 
+    static void releaseComm(const MPI_Comm& comm) ;
+
+    static void dumpComm(void) ;
+
+    static const std::map<MPI_Comm,std::string>& getCommTrack(void) {return commTrack_ ;}
+  } ;
 } 
 #endif

XIOS3/trunk/src/server.cpp

@@ -602 +602 @@
 
       CMemChecker::logMem( "CServer::finalize", true );
+      
+      CCommTrack::dumpComm() ;
+
       if (!is_MPI_Initialized)
       {