Changeset 2562

Timestamp:

09/12/23 08:52:28 (8 months ago)

Author:

jderouillat

Message:

Add the missing delete tokenManager_

Location:

XIOS3/trunk/src

Files:

• manager/ressources_manager.cpp (modified) (1 diff)
• transport/p2p_client_buffer.cpp (modified) (3 diffs)
• transport/p2p_context_server.cpp (modified) (3 diffs)
• transport/p2p_context_server.hpp (modified) (2 diffs)

XIOS3/trunk/src/manager/ressources_manager.cpp

@@ -43 +43 @@
     delete winNotify_ ;
     delete winRessources_ ;
+    delete tokenManager_ ;
   } 
 

XIOS3/trunk/src/transport/p2p_client_buffer.cpp

@@ -229 +229 @@
       if (flag==true)
       {
+        info(logProtocol) << "DBG : Send req deleted to "  << intraServerRank_ << ", of size " << request.buffer->count() << endl;
         delete request.buffer ;
         requests_.pop_front() ;
@@ -300 +301 @@
     }
     if (info.isActive(logProtocol)) CTimer::get("sendTimelineEvent : MPI_Isend").resume() ;
+    info(logProtocol) << "DBG : Send Hdr to "  << intraServerRank_ << ", of size " << request.buffer->count() << endl;
     MPI_Isend(request.buffer->start(),request.buffer->count(), MPI_CHAR, intraServerRank_, 20, interCommMerged_, &request.mpiRequest ) ;
+    //MPI_Send(request.buffer->start(),request.buffer->count(), MPI_CHAR, intraServerRank_, 20, interCommMerged_ ) ;
+    //delete request.buffer ;       
     if (info.isActive(logProtocol)) CTimer::get("sendTimelineEvent : MPI_Isend").suspend() ;
     info(logProtocol)<<outStr.str()<<endl ;
@@ -311 +315 @@
     request.buffer = new CBufferOut(sizeof(EVENT_BUFFER_RESIZE)+sizeof(timeline)+sizeof(size)) ; 
     *(request.buffer)<<EVENT_BUFFER_RESIZE<<timeline<<size ;
+    info(logProtocol) << "DBG : Send Hdr RESIZE to "  << intraServerRank_ << ", of size " << request.buffer->count() << endl;
     MPI_Isend(request.buffer->start(),request.buffer->count(), MPI_CHAR, intraServerRank_, 20, interCommMerged_, &request.mpiRequest ) ;
+    //MPI_Send(request.buffer->start(),request.buffer->count(), MPI_CHAR, intraServerRank_, 20, interCommMerged_ ) ;
+    //delete request.buffer ;
     requests_.push_back(request) ;
   }

XIOS3/trunk/src/transport/p2p_context_server.cpp

@@ -104 +104 @@
         requests_[rank].push_back(new CRequest(interCommMerged_, status)) ;
         // Test 1st request of the list, request treatment must be ordered 
+        //while (!requests_[rank].back()->test()) 
+        //{
+        //}
         if (requests_[rank].front()->test())
         {
@@ -110 +113 @@
           requests_[rank].pop_front() ;
         }
+        //CRequest* request = new CRequest(interCommMerged_, status);
+        //processRequest(*request) ;
+        //delete request;
       }
     }
@@ -134 +140 @@
     if (it==buffers_.end())
     {
+      info(logProtocol) << "DBG : Buffer(Hdr) created "  << rank << ", of size " << request.getCount() << endl;
       buffers_[rank] = new CP2pServerBuffer(rank, commSelf_, interCommMerged_, pendingEvents_, completedEvents_, request.getBuffer()) ;
     }
-    else
-    {
+    else {
+      info(logProtocol) << "DBG : Buffer(Hdr) received "  << rank << ", of size " << request.getCount() << endl;
       it->second->receivedRequest(request.getBuffer()) ;
     }

XIOS3/trunk/src/transport/p2p_context_server.hpp

@@ -36 +36 @@
             MPI_Get_count(&status,MPI_CHAR,&count_);
             buffer_.resize(count_) ;
+            info(logProtocol) << "DBG : Request created from "  << rank_ << ", of size " << count_ << endl;
             MPI_Irecv(buffer_.data(), count_, MPI_CHAR, rank_, 20, interComm, &request_) ;
+            //MPI_Status mpistatus;
+            //MPI_Recv(buffer_.data(), count_, MPI_CHAR, rank_, 20, interComm, &mpistatus) ;
           }
           
-          ~CRequest() { }
+          ~CRequest() { info(logProtocol) << "DBG : Request deleted "  << rank_ << ", of size " << count_ << endl; }
 
           bool test(void)
@@ -46 +49 @@
             MPI_Status status ;
             MPI_Test(&request_, &flag, &status) ;
-            if (flag==true) return true ;
+            if (flag==true) {
+              info(logProtocol) << "DBG : Request completed "  << rank_ << ", of size " << count_ << endl;
+              return true ;
+            }
             else return false ;
           }