Changeset 2557

Timestamp:

09/04/23 19:24:43 (17 months ago)

Author:

ymipsl

Message:

Bug fix for new p2p protocol.
YM

Location:

XIOS3/trunk/src/transport

Files:

• p2p_client_buffer.cpp (modified) (2 diffs)
• p2p_server_buffer.cpp (modified) (1 diff)

XIOS3/trunk/src/transport/p2p_client_buffer.cpp

@@ -14 +14 @@
     //control_[CONTROL_ADDR] = 0 ;
     //control_[CONTROL_FINALIZE] = 0 ;
-    //sendNewBuffer() ;
+    sendNewBuffer() ;
     createWindow(commSelf, interCommMerged, intraServerRank ) ;
     char dummy ;
@@ -308 +308 @@
   void CP2pClientBuffer::sendNewBuffer(void)
   {
-//    MPI_Aint controlAddr ;
+    MPI_Aint controlAddr ;
 //    MPI_Get_address(control_, &controlAddr) ;
-//    MPI_Send(&controlAddr, 1, MPI_AINT, intraServerRank_, 20, interCommMerged_) ;
+    MPI_Send(&controlAddr, 1, MPI_AINT, intraServerRank_, 20, interCommMerged_) ;
   }
 

XIOS3/trunk/src/transport/p2p_server_buffer.cpp

@@ -102 +102 @@
       {
         info(logProtocol)<<"Send bloc to free : "<<lastBlocToFree_<<endl ;
-        if (info.isActive(logProtocol)) CTimer::get("Send bloc to free").resume() ;
+        //if (info.isActive(logProtocol)) CTimer::get("Send bloc to free").resume() ;
         //MPI_Win_lock(MPI_LOCK_EXCLUSIVE, windowRank_, 0, winControl_) ;
         //MPI_Aint target=MPI_Aint_add(controlAddr_, CONTROL_ADDR*sizeof(MPI_Aint)) ;
         //MPI_Put(&lastBlocToFree_, 1, MPI_AINT, windowRank_, target, 1, MPI_AINT, winControl_) ;
         //MPI_Win_unlock(windowRank_,winControl_) ; 
-        if (info.isActive(logProtocol)) CTimer::get("Send bloc to free").suspend() ;
+        //if (info.isActive(logProtocol)) CTimer::get("Send bloc to free").suspend() ;
         lastBlocToFree_ = 0 ;        
       }