Changeset 2564 for XIOS3/trunk

Timestamp:

09/13/23 12:28:29 (17 months ago)

Author:

jderouillat

Message:

Clean memory leaks

Location:

XIOS3/trunk/src

Files:

• event_scheduler.cpp (modified) (3 diffs)
• node/context.cpp (modified) (1 diff)
• transport/context_client.hpp (modified) (1 diff)
• transport/context_server.hpp (modified) (1 diff)
• transport/p2p_server_buffer.cpp (modified) (2 diffs)
• transport/p2p_server_buffer.hpp (modified) (2 diffs)

XIOS3/trunk/src/event_scheduler.cpp

@@ -3 +3 @@
 #include "mpi.hpp"
 #include "tracer.hpp"
+#include "cxios.hpp"
 
 namespace xios
@@ -27 +28 @@
   {
     MPI_Comm_dup(comm, &communicator_) ;
+    CXios::getMpiGarbageCollector().registerCommunicator(communicator_) ;
     MPI_Comm_size(communicator_,&mpiSize_) ;
     MPI_Comm_rank(communicator_,&mpiRank_);
@@ -100 +102 @@
     else color=0 ;
     MPI_Comm_split(communicator_, color, mpiRank_, &newComm) ;
+    CXios::getMpiGarbageCollector().registerCommunicator(newComm) ;
 
     parent = make_shared<CEventScheduler>(newComm , schedulerLevel_) ;

XIOS3/trunk/src/node/context.cpp

@@ -77 +77 @@
      if (registryIn!=nullptr) delete registryIn ;
      if (registryOut!=nullptr) delete registryOut ;
+
+     if (onlineContextClient_!=nullptr) delete onlineContextClient_;
    }
 

XIOS3/trunk/src/transport/context_client.hpp

@@ -35 +35 @@
             // Contructor
       CContextClient(CContext* parent, MPI_Comm intraComm, MPI_Comm interComm, CContext* parentServer = 0);
+      virtual ~CContextClient() {} 
 
       bool isServerLeader(void) const;

XIOS3/trunk/src/transport/context_server.hpp

@@ -22 +22 @@
     
     CContextServer(CContext* parent,MPI_Comm intraComm,MPI_Comm interComm) ;
-    ~CContextServer() {} 
+    virtual ~CContextServer() {} 
     void setAssociatedClient(CContextClient* associatedClient) {associatedClient_=associatedClient ;}
     CContextClient* getAssociatedClient(void) { return associatedClient_ ;}

XIOS3/trunk/src/transport/p2p_server_buffer.cpp

@@ -113 +113 @@
 
     if (buffers_.size()>1) 
-     if (buffers_.front()->getCount()==0) buffers_.pop_front() ; // if buffer is empty free buffer
+    {
+      if (buffers_.front()->getCount()==0) {
+        delete buffers_.front();
+        buffers_.pop_front() ; // if buffer is empty free buffer
+      }
+    }
   }
 
@@ -422 +427 @@
       bloc.buffer->free(bloc.start, bloc.count) ; // free bloc
       addr=bloc.addr ;
-      if (bloc.buffer->getCount()==0) if (buffers_.size() > 1) buffers_.pop_front() ; // if buffer is empty free buffer
+      if (bloc.buffer->getCount()==0)
+      {
+        if (buffers_.size() > 1)
+        {
+          delete buffers_.front();
+          buffers_.pop_front() ; // if buffer is empty free buffer
+        }
+      }
     }
     event.push(clientRank_, nullptr, buffer, size) ;

XIOS3/trunk/src/transport/p2p_server_buffer.hpp

@@ -36 +36 @@
           { 
             if (count_>0) ERROR("COneSidedServerBuffer::~CBuffer()",<<"Try to delete buffer that is not empty"<<std::endl) ;
-            MPI_Free_mem(&buffer_) ;
+            MPI_Free_mem(buffer_) ;
           }
        
@@ -106 +106 @@
                              map<size_t, SPendingEvent>& completedEvents, vector<char>& buffer)  ;
       
+      ~CP2pServerBuffer()
+      {
+          while (!buffers_.empty()) {
+              delete buffers_.front();
+              buffers_.pop_front() ; // if buffer is empty free buffer
+          }
+      };
+
       void receivedRequest(vector<char>& buffer) ;
       void eventLoop(void) ;