Changeset 2671

Timestamp:

10/29/24 15:25:33 (3 months ago)

Author:

ymipsl

Message:

Suffix all data member of CContexServer/CContextClient class by "_"

YM

Location:

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/transport

Files:

• legacy_context_client.cpp (modified) (10 diffs)
• legacy_context_client.hpp (modified) (2 diffs)
• legacy_context_client_v2.cpp (modified) (9 diffs)
• legacy_context_client_v2.hpp (modified) (2 diffs)
• legacy_context_server.cpp (modified) (25 diffs)
• legacy_context_server.hpp (modified) (1 diff)
• legacy_context_server_v2.cpp (modified) (25 diffs)
• legacy_context_server_v2.hpp (modified) (1 diff)
• one_sided_context_client.cpp (modified) (8 diffs)
• one_sided_context_client.hpp (modified) (3 diffs)
• one_sided_context_server.cpp (modified) (9 diffs)
• one_sided_context_server.hpp (modified) (1 diff)
• p2p_context_client.cpp (modified) (14 diffs)
• p2p_context_client.hpp (modified) (2 diffs)
• p2p_context_server.cpp (modified) (9 diffs)
• p2p_context_server.hpp (modified) (1 diff)

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/transport/legacy_context_client.cpp

@@ -29 +29 @@
     CLegacyContextClient::CLegacyContextClient(CContext* parent, MPI_Comm intraComm, MPI_Comm interComm, CContext* cxtSer)
                          : CContextClient(parent, intraComm, interComm, cxtSer),
-                           mapBufferSize_(),  maxBufferedEvents(4)
+                           mapBufferSize_(),  maxBufferedEvents_(4)
     {
-      pureOneSided=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
+      pureOneSided_=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
       xios::MPI_Intercomm_merge(interComm_,false, &interCommMerged_) ;
       CXios::getMpiGarbageCollector().registerCommunicator(interCommMerged_) ;
@@ -37 +37 @@
       CXios::getMpiGarbageCollector().registerCommunicator(commSelf_) ;
       eventScheduler_ = parent->getEventScheduler() ;  
-      timeLine = 1;
+      timeLine_ = 1;
     }
 
@@ -49 +49 @@
 //      ostringstream str ;
 //      for(auto& rank : ranks) str<<rank<<" ; " ;
-//      info(100)<<"Event "<<timeLine<<" of context "<<context_->getId()<<"  for ranks : "<<str.str()<<endl ;
+//      info(100)<<"Event "<<timeLine_<<" of context "<<context_->getId()<<"  for ranks : "<<str.str()<<endl ;
 
       if (CXios::checkEventSync)
@@ -55 +55 @@
         int typeId, classId, typeId_in, classId_in;
         long long timeLine_out;
-        long long timeLine_in( timeLine );
+        long long timeLine_in( timeLine_ );
         typeId_in=event.getTypeId() ;
         classId_in=event.getClassId() ;
-//        MPI_Allreduce(&timeLine,&timeLine_out, 1, MPI_UINT64_T, MPI_SUM, intraComm_) ; // MPI_UINT64_T standardized by MPI 3
+//        MPI_Allreduce(&timeLine_,&timeLine_out, 1, MPI_UINT64_T, MPI_SUM, intraComm_) ; // MPI_UINT64_T standardized by MPI 3
         MPI_Allreduce(&timeLine_in,&timeLine_out, 1, MPI_LONG_LONG_INT, MPI_SUM, intraComm_) ; 
         MPI_Allreduce(&typeId_in,&typeId, 1, MPI_INT, MPI_SUM, intraComm_) ;
         MPI_Allreduce(&classId_in,&classId, 1, MPI_INT, MPI_SUM, intraComm_) ;
-        if (typeId/clientSize_!=event.getTypeId() || classId/clientSize_!=event.getClassId() || timeLine_out/clientSize_!=timeLine)
+        if (typeId/clientSize_!=event.getTypeId() || classId/clientSize_!=event.getClassId() || timeLine_out/clientSize_!=timeLine_)
         {
            ERROR("void CLegacyContextClient::sendEvent(CEventClient& event)",
-               << "Event are not coherent between client for timeline = "<<timeLine);
+               << "Event are not coherent between client for timeline = "<<timeLine_);
         }
         
@@ -77 +77 @@
         {
           ERROR("void CLegacyContextClient::sendEvent(CEventClient& event)",
-                 <<" Some servers will not receive the message for timeline = "<<timeLine<<endl
+                 <<" Some servers will not receive the message for timeline = "<<timeLine_<<endl
                  <<"Servers are : "<<osstr.str()) ;
         }
@@ -90 +90 @@
          // We force the getBuffers call to be non-blocking on classical servers
         list<CBufferOut*> buffList;
-        getBuffers(timeLine, ranks, sizes, buffList) ;
-
-        event.send(timeLine, sizes, buffList);
+        getBuffers(timeLine_, ranks, sizes, buffList) ;
+
+        event.send(timeLine_, sizes, buffList);
        
         //for (auto itRank = ranks.begin(); itRank != ranks.end(); itRank++) buffers[*itRank]->infoBuffer() ;
@@ -102 +102 @@
       
       synchronize() ;
-      timeLine++;
+      timeLine_++;
     }
 
@@ -297 +297 @@
         error(0) << "WARNING: Unexpected request for buffer to communicate with server " << rank << std::endl;
         mapBufferSize_[rank] = CXios::minBufferSize;
-        maxEventSizes[rank] = CXios::minBufferSize;
+        maxEventSizes_[rank] = CXios::minBufferSize;
       }
       bool hasWindows = true ;
@@ -328 +328 @@
       bool pending = false;
       for (itBuff = buffers.begin(); itBuff != buffers.end(); itBuff++)
-        pending |= itBuff->second->checkBuffer(!pureOneSided);
+        pending |= itBuff->second->checkBuffer(!pureOneSided_);
       return pending;
    }
@@ -378 +378 @@
       list<int>::iterator it;
       bool pending = false;
-      for (it = ranks.begin(); it != ranks.end(); it++) pending |= buffers[*it]->checkBuffer(!pureOneSided);
+      for (it = ranks.begin(); it != ranks.end(); it++) pending |= buffers[*it]->checkBuffer(!pureOneSided_);
       return pending;
    }

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/transport/legacy_context_client.hpp

@@ -62 +62 @@
 
 
-      size_t timeLine; //!< Timeline of each event
+      size_t timeLine_; //!< Timeline of each event
 
       MPI_Comm interCommMerged_; //!< Communicator of the client group + server group (intraCommunicator) needed for one sided communication.
@@ -69 +69 @@
       map<int,CClientBuffer*> buffers; //!< Buffers for connection to servers
 
-      bool pureOneSided ; //!< if true, client will communicated with servers only trough one sided communication. Otherwise the hybrid mode P2P /One sided is used.
+      bool pureOneSided_ ; //!< if true, client will communicated with servers only trough one sided communication. Otherwise the hybrid mode P2P /One sided is used.
       
       //! Mapping of server and buffer size for each connection to server
       std::map<int,StdSize> mapBufferSize_;
       //! Maximum event sizes estimated for each connection to server
-      std::map<int,StdSize> maxEventSizes;
+      std::map<int,StdSize> maxEventSizes_;
       //! Maximum number of events that can be buffered
-      StdSize maxBufferedEvents;
+      StdSize maxBufferedEvents_;
 
       std::map<int, MPI_Comm> winComm_ ; //! Window communicators

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/transport/legacy_context_client_v2.cpp

@@ -29 +29 @@
     CLegacyContextClientV2::CLegacyContextClientV2(CContext* parent, MPI_Comm intraComm, MPI_Comm interComm, CContext* cxtSer)
                          : CContextClient(parent, intraComm, interComm, cxtSer),
-                           mapBufferSize_(),  maxBufferedEvents(4)
+                           mapBufferSize_(),  maxBufferedEvents_(4)
     {
-      pureOneSided=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
+      pureOneSided_=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
       xios::MPI_Intercomm_merge(interComm_,false, &interCommMerged_) ;
       CXios::getMpiGarbageCollector().registerCommunicator(interCommMerged_) ;
@@ -49 +49 @@
 
       eventScheduler_ = parent->getEventScheduler() ;  
-      timeLine = 1;
+      timeLine_ = 1;
     }
 
@@ -63 +63 @@
         int typeId, classId, typeId_in, classId_in;
         long long timeLine_out;
-        long long timeLine_in( timeLine );
+        long long timeLine_in( timeLine_ );
         typeId_in=event.getTypeId() ;
         classId_in=event.getClassId() ;
-//        MPI_Allreduce(&timeLine,&timeLine_out, 1, MPI_UINT64_T, MPI_SUM, intraComm_) ; // MPI_UINT64_T standardized by MPI 3
+//        MPI_Allreduce(&timeLine_,&timeLine_out, 1, MPI_UINT64_T, MPI_SUM, intraComm_) ; // MPI_UINT64_T standardized by MPI 3
         MPI_Allreduce(&timeLine_in,&timeLine_out, 1, MPI_LONG_LONG_INT, MPI_SUM, intraComm_) ; 
         MPI_Allreduce(&typeId_in,&typeId, 1, MPI_INT, MPI_SUM, intraComm_) ;
         MPI_Allreduce(&classId_in,&classId, 1, MPI_INT, MPI_SUM, intraComm_) ;
-        if (typeId/clientSize_!=event.getTypeId() || classId/clientSize_!=event.getClassId() || timeLine_out/clientSize_!=timeLine)
+        if (typeId/clientSize_!=event.getTypeId() || classId/clientSize_!=event.getClassId() || timeLine_out/clientSize_!=timeLine_)
         {
            ERROR("void CLegacyContextClientV2::sendEvent(CEventClient& event)",
-               << "Event are not coherent between client for timeline = "<<timeLine);
+               << "Event are not coherent between client for timeline = "<<timeLine_);
         }
         
@@ -85 +85 @@
         {
           ERROR("void CLegacyContextClientV2::sendEvent(CEventClient& event)",
-                 <<" Some servers will not receive the message for timeline = "<<timeLine<<endl
+                 <<" Some servers will not receive the message for timeline = "<<timeLine_<<endl
                  <<"Servers are : "<<osstr.str()) ;
         }
@@ -98 +98 @@
          // We force the getBuffers call to be non-blocking on classical servers
         list<CBufferOut*> buffList;
-        getBuffers(timeLine, ranks, sizes, buffList) ;
-
-        event.send(timeLine, sizes, buffList);
+        getBuffers(timeLine_, ranks, sizes, buffList) ;
+
+        event.send(timeLine_, sizes, buffList);
        
         unlockBuffers(ranks) ;
@@ -108 +108 @@
       
       synchronize() ;
-      timeLine++;
+      timeLine_++;
     }
 
@@ -221 +221 @@
         error(0) << "WARNING: Unexpected request for buffer to communicate with server " << rank << std::endl;
         mapBufferSize_[rank] = CXios::minBufferSize;
-        maxEventSizes[rank] = CXios::minBufferSize;
+        maxEventSizes_[rank] = CXios::minBufferSize;
       }
       bool hasWindows = true ;
@@ -256 +256 @@
       bool pending = false;
       for (itBuff = buffers.begin(); itBuff != buffers.end(); itBuff++)
-        pending |= itBuff->second->checkBuffer(!pureOneSided);
+        pending |= itBuff->second->checkBuffer(!pureOneSided_);
       return pending;
    }
@@ -306 +306 @@
       list<int>::iterator it;
       bool pending = false;
-      for (it = ranks.begin(); it != ranks.end(); it++) pending |= buffers[*it]->checkBuffer(!pureOneSided);
+      for (it = ranks.begin(); it != ranks.end(); it++) pending |= buffers[*it]->checkBuffer(!pureOneSided_);
       return pending;
    }

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/transport/legacy_context_client_v2.hpp

@@ -62 +62 @@
 
 
-      size_t timeLine; //!< Timeline of each event
+      size_t timeLine_; //!< Timeline of each event
 
       MPI_Comm interCommMerged_; //!< Communicator of the client group + server group (intraCommunicator) needed for one sided communication.
@@ -69 +69 @@
       map<int,CLegacyClientBufferV2*> buffers; //!< Buffers for connection to servers
 
-      bool pureOneSided ; //!< if true, client will communicated with servers only trough one sided communication. Otherwise the hybrid mode P2P /One sided is used.
+      bool pureOneSided_ ; //!< if true, client will communicated with servers only trough one sided communication. Otherwise the hybrid mode P2P /One sided is used.
       
       //! Mapping of server and buffer size for each connection to server
       std::map<int,StdSize> mapBufferSize_;
       //! Maximum event sizes estimated for each connection to server
-      std::map<int,StdSize> maxEventSizes;
+      std::map<int,StdSize> maxEventSizes_;
       //! Maximum number of events that can be buffered
-      StdSize maxBufferedEvents;
+      StdSize maxBufferedEvents_;
 
       std::map<int, MPI_Comm> winComm_ ; //! Window communicators

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/transport/legacy_context_server.cpp

@@ -40 +40 @@
     CXios::getMpiGarbageCollector().registerCommunicator(processEventBarrier_) ;
 
-    currentTimeLine=1;
-    scheduled=false;
-    finished=false;
+    currentTimeLine_=1;
+    scheduled_=false;
+    finished_=false;
 
     xios::MPI_Intercomm_merge(interComm_,true,&interCommMerged_) ;
@@ -49 +49 @@
     CXios::getMpiGarbageCollector().registerCommunicator(commSelf_) ;
   
-    itLastTimeLine=lastTimeLine.begin() ;
-
-    pureOneSided=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
+    itLastTimeLine_=lastTimeLine_.begin() ;
+
+    pureOneSided_=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
   }
  
   void CLegacyContextServer::setPendingEvent(void)
   {
-    pendingEvent=true;
+    pendingEvent_=true;
   }
 
   bool CLegacyContextServer::hasPendingEvent(void)
   {
-    return (pendingRequest.size()!=0);
+    return (pendingRequest_.size()!=0);
   }
 
   bool CLegacyContextServer::hasFinished(void)
   {
-    return finished;
+    return finished_;
   }
 
@@ -83 +83 @@
     if (info.isActive(logTimers)) CTimer::get("check event process").suspend();
     if (info.isActive(logProfile)) CTimer::get("Recv event loop (legacy)").suspend();
-    return finished;
+    return finished_;
   }
 
@@ -110 +110 @@
     int rank=status.MPI_SOURCE ;
 
-    it=buffers.find(rank);
-    if (it==buffers.end()) // Receive the buffer size and allocate the buffer
+    it=buffers_.find(rank);
+    if (it==buffers_.end()) // Receive the buffer size and allocate the buffer
     {
       MPI_Aint recvBuff[4] ;
@@ -148 +148 @@
       MPI_Barrier(winComm_[rank]) ;
 
-      it=(buffers.insert(pair<int,CServerBuffer*>(rank, new CServerBuffer(rank, windows_[rank], winBufferAddress, 0, buffSize)))).first;
-      lastTimeLine[rank]=0 ;
-      itLastTimeLine=lastTimeLine.begin() ;
+      it=(buffers_.insert(pair<int,CServerBuffer*>(rank, new CServerBuffer(rank, windows_[rank], winBufferAddress, 0, buffSize)))).first;
+      lastTimeLine_[rank]=0 ;
+      itLastTimeLine_=lastTimeLine_.begin() ;
 
       return true;
@@ -157 +157 @@
     {
         std::pair<MPI_Message,MPI_Status> mypair(message,status) ;
-        pendingProbe[rank].push_back(mypair) ;
+        pendingProbe_[rank].push_back(mypair) ;
         return false;
     }
@@ -169 +169 @@
     map<int, list<std::pair<MPI_Message,MPI_Status> > >::iterator itProbe;
 
-    for(itProbe=pendingProbe.begin();itProbe!=pendingProbe.end();itProbe++)
+    for(itProbe=pendingProbe_.begin();itProbe!=pendingProbe_.end();itProbe++)
     {
       int rank=itProbe->first ;
-      if (pendingRequest.count(rank)==0)
+      if (pendingRequest_.count(rank)==0)
       {
         MPI_Message& message = itProbe->second.front().first ;
@@ -178 +178 @@
         int count ;
         MPI_Get_count(&status,MPI_CHAR,&count);
-        map<int,CServerBuffer*>::iterator it = buffers.find(rank);
+        map<int,CServerBuffer*>::iterator it = buffers_.find(rank);
         if ( (it->second->isBufferFree(count) && !it->second->isResizing()) // accept new request if buffer is free
           || (it->second->isResizing() && it->second->isBufferEmpty()) )    // or if resizing wait for buffer is empty
@@ -184 +184 @@
           char * addr;
           addr=(char*)it->second->getBuffer(count);
-          MPI_Imrecv(addr,count,MPI_CHAR, &message, &pendingRequest[rank]);
-          bufferRequest[rank]=addr;
+          MPI_Imrecv(addr,count,MPI_CHAR, &message, &pendingRequest_[rank]);
+          bufferRequest_[rank]=addr;
           recvProbe.push_back(rank) ;
           itProbe->second.pop_front() ;
@@ -192 +192 @@
     }
 
-    for(itRecv=recvProbe.begin(); itRecv!=recvProbe.end(); itRecv++) if (pendingProbe[*itRecv].empty()) pendingProbe.erase(*itRecv) ;
+    for(itRecv=recvProbe.begin(); itRecv!=recvProbe.end(); itRecv++) if (pendingProbe_[*itRecv].empty()) pendingProbe_.erase(*itRecv) ;
   }
 
@@ -206 +206 @@
     MPI_Status status;
    
-    if (!pendingRequest.empty()) if (info.isActive(logTimers)) CTimer::get("receiving requests").resume();
+    if (!pendingRequest_.empty()) if (info.isActive(logTimers)) CTimer::get("receiving requests").resume();
     else if (info.isActive(logTimers)) CTimer::get("receiving requests").suspend();
 
-    for(it=pendingRequest.begin();it!=pendingRequest.end();it++)
+    for(it=pendingRequest_.begin();it!=pendingRequest_.end();it++)
     {
       rank=it->first;
@@ -217 +217 @@
       if (flag==true)
       {
-        buffers[rank]->updateCurrentWindows() ;
+        buffers_[rank]->updateCurrentWindows() ;
         recvRequest.push_back(rank);
         MPI_Get_count(&status,MPI_CHAR,&count);
-        processRequest(rank,bufferRequest[rank],count);
+        processRequest(rank,bufferRequest_[rank],count);
       }
     }
@@ -226 +226 @@
     for(itRecv=recvRequest.begin();itRecv!=recvRequest.end();itRecv++)
     {
-      pendingRequest.erase(*itRecv);
-      bufferRequest.erase(*itRecv);
+      pendingRequest_.erase(*itRecv);
+      bufferRequest_.erase(*itRecv);
     }
   }
@@ -239 +239 @@
     size_t count ; 
 
-    if (itLastTimeLine==lastTimeLine.end()) itLastTimeLine=lastTimeLine.begin() ;
-    for(;itLastTimeLine!=lastTimeLine.end();++itLastTimeLine)
-    {
-      rank=itLastTimeLine->first ;
-      if (itLastTimeLine->second < timeLine &&  pendingRequest.count(rank)==0 && buffers[rank]->isBufferEmpty())
-      {
-        if (buffers[rank]->getBufferFromClient(timeLine, buffer, count)) processRequest(rank, buffer, count);
-        if (count >= 0) ++itLastTimeLine ;
+    if (itLastTimeLine_==lastTimeLine_.end()) itLastTimeLine_=lastTimeLine_.begin() ;
+    for(;itLastTimeLine_!=lastTimeLine_.end();++itLastTimeLine_)
+    {
+      rank=itLastTimeLine_->first ;
+      if (itLastTimeLine_->second < timeLine &&  pendingRequest_.count(rank)==0 && buffers_[rank]->isBufferEmpty())
+      {
+        if (buffers_[rank]->getBufferFromClient(timeLine, buffer, count)) processRequest(rank, buffer, count);
+        if (count >= 0) ++itLastTimeLine_ ;
         break ;
       }
@@ -273 +273 @@
       if (timeLine==timelineEventNotifyChangeBufferSize)
       {
-        buffers[rank]->notifyBufferResizing() ;
-        buffers[rank]->updateCurrentWindows() ;
-        buffers[rank]->popBuffer(count) ;
+        buffers_[rank]->notifyBufferResizing() ;
+        buffers_[rank]->updateCurrentWindows() ;
+        buffers_[rank]->popBuffer(count) ;
         info(100)<<"Context id "<<context_->getId()<<" : Receive NotifyChangeBufferSize from client rank "<<rank<<endl
-                 <<"isBufferEmpty ? "<<buffers[rank]->isBufferEmpty()<<"  remaining count : "<<buffers[rank]->getUsed()<<endl;
+                 <<"isBufferEmpty ? "<<buffers_[rank]->isBufferEmpty()<<"  remaining count : "<<buffers_[rank]->getUsed()<<endl;
       } 
       else if (timeLine==timelineEventChangeBufferSize)
@@ -284 +284 @@
         vector<MPI_Aint> winBufferAdress(2) ;
         newBuffer>>newSize>>winBufferAdress[0]>>winBufferAdress[1] ;
-        buffers[rank]->freeBuffer(count) ;
-        delete buffers[rank] ;
+        buffers_[rank]->freeBuffer(count) ;
+        delete buffers_[rank] ;
         windows_[rank][0] -> setWinBufferAddress(winBufferAdress[0],0) ;
         windows_[rank][1] -> setWinBufferAddress(winBufferAdress[1],0) ;
-        buffers[rank] = new CServerBuffer(rank, windows_[rank], winBufferAdress, 0, newSize) ;
+        buffers_[rank] = new CServerBuffer(rank, windows_[rank], winBufferAdress, 0, newSize) ;
         info(100)<<"Context id "<<context_->getId()<<" : Receive ChangeBufferSize from client rank "<<rank
                  <<"  newSize : "<<newSize<<" Address : "<<winBufferAdress[0]<<" & "<<winBufferAdress[1]<<endl ;
@@ -295 +295 @@
       {
         info(100)<<"Context id "<<context_->getId()<<" : Receive standard event from client rank "<<rank<<"  with timeLine : "<<timeLine<<endl ;
-        it=events.find(timeLine);
+        it=events_.find(timeLine);
        
-        if (it==events.end()) it=events.insert(pair<int,CEventServer*>(timeLine,new CEventServer(this))).first;
-        it->second->push(rank,buffers[rank],startBuffer,size);
-        if (timeLine>0) lastTimeLine[rank]=timeLine ;
+        if (it==events_.end()) it=events_.insert(pair<int,CEventServer*>(timeLine,new CEventServer(this))).first;
+        it->second->push(rank,buffers_[rank],startBuffer,size);
+        if (timeLine>0) lastTimeLine_[rank]=timeLine ;
       }
       buffer.advance(size);
@@ -315 +315 @@
     if (isProcessingEvent_) return ;
 
-    it=events.find(currentTimeLine);
-    if (it!=events.end())
+    it=events_.find(currentTimeLine_);
+    if (it!=events_.end())
     {
       event=it->second;
@@ -322 +322 @@
       if (event->isFull())
       {
-        if (!scheduled)
+        if (!scheduled_)
         {
-          eventScheduler_->registerEvent(currentTimeLine,hashId_);
-          info(100)<<"Context id "<<context_->getId()<<"Schedule event : "<< currentTimeLine <<"  "<<hashId_<<endl ;
-          scheduled=true;
+          eventScheduler_->registerEvent(currentTimeLine_,hashId_);
+          info(100)<<"Context id "<<context_->getId()<<"Schedule event : "<< currentTimeLine_ <<"  "<<hashId_<<endl ;
+          scheduled_=true;
         }
-        else if (eventScheduler_->queryEvent(currentTimeLine,hashId_) )
+        else if (eventScheduler_->queryEvent(currentTimeLine_,hashId_) )
         {
           if (!enableEventsProcessing && isCollectiveEvent(*event)) return ;
@@ -351 +351 @@
             int typeId, classId, typeId_in, classId_in;
             long long timeLine_out;
-            long long timeLine_in( currentTimeLine );
+            long long timeLine_in( currentTimeLine_ );
             typeId_in=event->type ;
             classId_in=event->classId ;
@@ -358 +358 @@
             MPI_Allreduce(&typeId_in,&typeId, 1, MPI_INT, MPI_SUM, intraComm_) ;
             MPI_Allreduce(&classId_in,&classId, 1, MPI_INT, MPI_SUM, intraComm_) ;
-            if (typeId/intraCommSize_!=event->type || classId/intraCommSize_!=event->classId || timeLine_out/intraCommSize_!=currentTimeLine)
+            if (typeId/intraCommSize_!=event->type || classId/intraCommSize_!=event->classId || timeLine_out/intraCommSize_!=currentTimeLine_)
             {
                ERROR("void CLegacyContextClient::sendEvent(CEventClient& event)",
-                  << "Event are not coherent between client for timeline = "<<currentTimeLine);
+                  << "Event are not coherent between client for timeline = "<<currentTimeLine_);
             }
           }
@@ -367 +367 @@
           isProcessingEvent_=true ;
           CTimer::get("Process events").resume();
-          info(100)<<"Context id "<<context_->getId()<<" : Process Event "<<currentTimeLine<<" of class "<<event->classId<<" of type "<<event->type<<endl ;
+          info(100)<<"Context id "<<context_->getId()<<" : Process Event "<<currentTimeLine_<<" of class "<<event->classId<<" of type "<<event->type<<endl ;
           eventScheduler_->popEvent() ;
           dispatchEvent(*event);
           CTimer::get("Process events").suspend();
           isProcessingEvent_=false ;
-          pendingEvent=false;
+          pendingEvent_=false;
           delete event;
-          events.erase(it);
-          currentTimeLine++;
-          scheduled = false;
+          events_.erase(it);
+          currentTimeLine_++;
+          scheduled_ = false;
         }
       }
-      else if (pendingRequest.empty()) getBufferFromClient(currentTimeLine) ;
-    }
-    else if (pendingRequest.empty()) getBufferFromClient(currentTimeLine) ; // if pure one sided check buffer even if no event recorded at current time line
+      else if (pendingRequest_.empty()) getBufferFromClient(currentTimeLine_) ;
+    }
+    else if (pendingRequest_.empty()) getBufferFromClient(currentTimeLine_) ; // if pure one sided check buffer even if no event recorded at current time line
   }
 
@@ -387 +387 @@
   {
     map<int,CServerBuffer*>::iterator it;
-    for(it=buffers.begin();it!=buffers.end();++it) delete it->second;
-    buffers.clear() ;
+    for(it=buffers_.begin();it!=buffers_.end();++it) delete it->second;
+    buffers_.clear() ;
   }
 
   void CLegacyContextServer::releaseBuffers()
   {
-    //for(auto it=buffers.begin();it!=buffers.end();++it) delete it->second ;
-    //buffers.clear() ; 
+    //for(auto it=buffers_.begin();it!=buffers_.end();++it) delete it->second ;
+    //buffers_.clear() ; 
     freeWindows() ;
   }
@@ -412 +412 @@
   void CLegacyContextServer::notifyClientsFinalize(void)
   {
-    for(auto it=buffers.begin();it!=buffers.end();++it)
+    for(auto it=buffers_.begin();it!=buffers_.end();++it)
     {
       it->second->notifyClientFinalize() ;
@@ -432 +432 @@
     {
       if (info.isActive(logProfile)) CTimer::get("Context finalize").resume();
-      finished=true;
+      finished_=true;
       info(20)<<" CLegacyContextServer: Receive context <"<<context_->getId()<<"> finalize."<<endl;
       notifyClientsFinalize() ;

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/transport/legacy_context_server.hpp

@@ -42 +42 @@
     MPI_Comm commSelf_ ; //!< Communicator for proc alone from interCommMerged 
 
-    map<int,CServerBuffer*> buffers ;
-    map<int,size_t> lastTimeLine ; //!< last event time line for a processed request
-    map<int,size_t>::iterator itLastTimeLine ; //!< iterator on lastTimeLine
-    map<int, list<std::pair<MPI_Message,MPI_Status> > > pendingProbe;
-    map<int,MPI_Request> pendingRequest ;
-    map<int,char*> bufferRequest ;
+    map<int,CServerBuffer*> buffers_ ;
+    map<int,size_t> lastTimeLine_ ; //!< last event time line for a processed request
+    map<int,size_t>::iterator itLastTimeLine_ ; //!< iterator on lastTimeLine
+    map<int, list<std::pair<MPI_Message,MPI_Status> > > pendingProbe_;
+    map<int,MPI_Request> pendingRequest_ ;
+    map<int,char*> bufferRequest_ ;
 
-    map<size_t,CEventServer*> events ;
-    size_t currentTimeLine ;
+    map<size_t,CEventServer*> events_ ;
+    size_t currentTimeLine_ ;
       
-    bool finished ;
-    bool pendingEvent ;
-    bool scheduled  ;    /*!< event of current timeline is alreading scheduled ? */
-    bool pureOneSided ; //!< if true, client will communicated with servers only trough one sided communication. Otherwise the hybrid mode P2P /One sided is used.
+    bool finished_ ;
+    bool pendingEvent_ ;
+    bool scheduled_  ;    /*!< event of current timeline is alreading scheduled ? */
+    bool pureOneSided_ ; //!< if true, client will communicated with servers only trough one sided communication. Otherwise the hybrid mode P2P /One sided is used.
 
     ~CLegacyContextServer() ;

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/transport/legacy_context_server_v2.cpp

@@ -40 +40 @@
     CXios::getMpiGarbageCollector().registerCommunicator(processEventBarrier_) ;
 
-    currentTimeLine=1;
-    scheduled=false;
-    finished=false;
+    currentTimeLine_=1;
+    scheduled_=false;
+    finished_=false;
 
     xios::MPI_Intercomm_merge(interComm_,true,&interCommMerged_) ;
@@ -59 +59 @@
     }
   
-    itLastTimeLine=lastTimeLine.begin() ;
-
-    pureOneSided=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
+    itLastTimeLine_=lastTimeLine_.begin() ;
+
+    pureOneSided_=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
   }
  
   void CLegacyContextServerV2::setPendingEvent(void)
   {
-    pendingEvent=true;
+    pendingEvent_=true;
   }
 
   bool CLegacyContextServerV2::hasPendingEvent(void)
   {
-    return (pendingRequest.size()!=0);
+    return (pendingRequest_.size()!=0);
   }
 
   bool CLegacyContextServerV2::hasFinished(void)
   {
-    return finished;
+    return finished_;
   }
 
@@ -93 +93 @@
     if (info.isActive(logTimers)) CTimer::get("check event process").suspend();
     if (info.isActive(logProfile)) CTimer::get("Recv event loop (legacy)").suspend();
-    return finished;
+    return finished_;
   }
 
@@ -120 +120 @@
     int rank=status.MPI_SOURCE ;
 
-    it=buffers.find(rank);
-    if (it==buffers.end()) // Receive the buffer size and allocate the buffer
+    it=buffers_.find(rank);
+    if (it==buffers_.end()) // Receive the buffer size and allocate the buffer
     {
       MPI_Aint recvBuff[4] ;
@@ -148 +148 @@
       if (info.isActive(logTimers)) CTimer::get("create Windows").suspend() ;
 
-      it=(buffers.insert(pair<int,CServerBuffer*>(rank, new CServerBuffer(rank, windows_[rank], winBufferAddress, rank, buffSize)))).first;
-      lastTimeLine[rank]=0 ;
-      itLastTimeLine=lastTimeLine.begin() ;
+      it=(buffers_.insert(pair<int,CServerBuffer*>(rank, new CServerBuffer(rank, windows_[rank], winBufferAddress, rank, buffSize)))).first;
+      lastTimeLine_[rank]=0 ;
+      itLastTimeLine_=lastTimeLine_.begin() ;
 
       return true;
@@ -157 +157 @@
     {
         std::pair<MPI_Message,MPI_Status> mypair(message,status) ;
-        pendingProbe[rank].push_back(mypair) ;
+        pendingProbe_[rank].push_back(mypair) ;
         return false;
     }
@@ -169 +169 @@
     map<int, list<std::pair<MPI_Message,MPI_Status> > >::iterator itProbe;
 
-    for(itProbe=pendingProbe.begin();itProbe!=pendingProbe.end();itProbe++)
+    for(itProbe=pendingProbe_.begin();itProbe!=pendingProbe_.end();itProbe++)
     {
       int rank=itProbe->first ;
-      if (pendingRequest.count(rank)==0)
+      if (pendingRequest_.count(rank)==0)
       {
         MPI_Message& message = itProbe->second.front().first ;
@@ -178 +178 @@
         int count ;
         MPI_Get_count(&status,MPI_CHAR,&count);
-        map<int,CServerBuffer*>::iterator it = buffers.find(rank);
+        map<int,CServerBuffer*>::iterator it = buffers_.find(rank);
         if ( (it->second->isBufferFree(count) && !it->second->isResizing()) // accept new request if buffer is free
           || (it->second->isResizing() && it->second->isBufferEmpty()) )    // or if resizing wait for buffer is empty
@@ -184 +184 @@
           char * addr;
           addr=(char*)it->second->getBuffer(count);
-          MPI_Imrecv(addr,count,MPI_CHAR, &message, &pendingRequest[rank]);
-          bufferRequest[rank]=addr;
+          MPI_Imrecv(addr,count,MPI_CHAR, &message, &pendingRequest_[rank]);
+          bufferRequest_[rank]=addr;
           recvProbe.push_back(rank) ;
           itProbe->second.pop_front() ;
@@ -192 +192 @@
     }
 
-    for(itRecv=recvProbe.begin(); itRecv!=recvProbe.end(); itRecv++) if (pendingProbe[*itRecv].empty()) pendingProbe.erase(*itRecv) ;
+    for(itRecv=recvProbe.begin(); itRecv!=recvProbe.end(); itRecv++) if (pendingProbe_[*itRecv].empty()) pendingProbe_.erase(*itRecv) ;
   }
 
@@ -206 +206 @@
     MPI_Status status;
    
-    if (!pendingRequest.empty()) if (info.isActive(logTimers)) CTimer::get("receiving requests").resume();
+    if (!pendingRequest_.empty()) if (info.isActive(logTimers)) CTimer::get("receiving requests").resume();
     else if (info.isActive(logTimers)) CTimer::get("receiving requests").suspend();
 
-    for(it=pendingRequest.begin();it!=pendingRequest.end();it++)
+    for(it=pendingRequest_.begin();it!=pendingRequest_.end();it++)
     {
       rank=it->first;
@@ -217 +217 @@
       if (flag==true)
       {
-        buffers[rank]->updateCurrentWindows() ;
+        buffers_[rank]->updateCurrentWindows() ;
         recvRequest.push_back(rank);
         MPI_Get_count(&status,MPI_CHAR,&count);
-        processRequest(rank,bufferRequest[rank],count);
+        processRequest(rank,bufferRequest_[rank],count);
       }
     }
@@ -226 +226 @@
     for(itRecv=recvRequest.begin();itRecv!=recvRequest.end();itRecv++)
     {
-      pendingRequest.erase(*itRecv);
-      bufferRequest.erase(*itRecv);
+      pendingRequest_.erase(*itRecv);
+      bufferRequest_.erase(*itRecv);
     }
   }
@@ -239 +239 @@
     size_t count ; 
 
-    if (itLastTimeLine==lastTimeLine.end()) itLastTimeLine=lastTimeLine.begin() ;
-    for(;itLastTimeLine!=lastTimeLine.end();++itLastTimeLine)
-    {
-      rank=itLastTimeLine->first ;
-      if (itLastTimeLine->second < timeLine &&  pendingRequest.count(rank)==0 && buffers[rank]->isBufferEmpty())
-      {
-        if (buffers[rank]->getBufferFromClient(timeLine, buffer, count)) processRequest(rank, buffer, count);
-        if (count >= 0) ++itLastTimeLine ;
+    if (itLastTimeLine_==lastTimeLine_.end()) itLastTimeLine_=lastTimeLine_.begin() ;
+    for(;itLastTimeLine_!=lastTimeLine_.end();++itLastTimeLine_)
+    {
+      rank=itLastTimeLine_->first ;
+      if (itLastTimeLine_->second < timeLine &&  pendingRequest_.count(rank)==0 && buffers_[rank]->isBufferEmpty())
+      {
+        if (buffers_[rank]->getBufferFromClient(timeLine, buffer, count)) processRequest(rank, buffer, count);
+        if (count >= 0) ++itLastTimeLine_ ;
         break ;
       }
@@ -273 +273 @@
       if (timeLine==timelineEventNotifyChangeBufferSize)
       {
-        buffers[rank]->notifyBufferResizing() ;
-        buffers[rank]->updateCurrentWindows() ;
-        buffers[rank]->popBuffer(count) ;
+        buffers_[rank]->notifyBufferResizing() ;
+        buffers_[rank]->updateCurrentWindows() ;
+        buffers_[rank]->popBuffer(count) ;
         info(100)<<"Context id "<<context_->getId()<<" : Receive NotifyChangeBufferSize from client rank "<<rank<<endl
-                 <<"isBufferEmpty ? "<<buffers[rank]->isBufferEmpty()<<"  remaining count : "<<buffers[rank]->getUsed()<<endl;
+                 <<"isBufferEmpty ? "<<buffers_[rank]->isBufferEmpty()<<"  remaining count : "<<buffers_[rank]->getUsed()<<endl;
       } 
       else if (timeLine==timelineEventChangeBufferSize)
@@ -284 +284 @@
         vector<MPI_Aint> winBufferAdress(2) ;
         newBuffer>>newSize>>winBufferAdress[0]>>winBufferAdress[1] ;
-        buffers[rank]->freeBuffer(count) ;
-        delete buffers[rank] ;
+        buffers_[rank]->freeBuffer(count) ;
+        delete buffers_[rank] ;
 
         int serverRank, commSize ;
         windows_[rank][0] -> setWinBufferAddress(winBufferAdress[0], rank) ;
         windows_[rank][1] -> setWinBufferAddress(winBufferAdress[1], rank) ;
-        buffers[rank] = new CServerBuffer(rank, windows_[rank], winBufferAdress, rank, newSize) ;
+        buffers_[rank] = new CServerBuffer(rank, windows_[rank], winBufferAdress, rank, newSize) ;
         info(100)<<"Context id "<<context_->getId()<<" : Receive ChangeBufferSize from client rank "<<rank
                  <<"  newSize : "<<newSize<<" Address : "<<winBufferAdress[0]<<" & "<<winBufferAdress[1]<<endl ;
@@ -297 +297 @@
       {
         info(100)<<"Context id "<<context_->getId()<<" : Receive standard event from client rank "<<rank<<"  with timeLine : "<<timeLine<<endl ;
-        it=events.find(timeLine);
+        it=events_.find(timeLine);
        
-        if (it==events.end()) it=events.insert(pair<int,CEventServer*>(timeLine,new CEventServer(this))).first;
-        it->second->push(rank,buffers[rank],startBuffer,size);
-        if (timeLine>0) lastTimeLine[rank]=timeLine ;
+        if (it==events_.end()) it=events_.insert(pair<int,CEventServer*>(timeLine,new CEventServer(this))).first;
+        it->second->push(rank,buffers_[rank],startBuffer,size);
+        if (timeLine>0) lastTimeLine_[rank]=timeLine ;
       }
       buffer.advance(size);
@@ -317 +317 @@
     if (isProcessingEvent_) return ;
 
-    it=events.find(currentTimeLine);
-    if (it!=events.end())
+    it=events_.find(currentTimeLine_);
+    if (it!=events_.end())
     {
       event=it->second;
@@ -324 +324 @@
       if (event->isFull())
       {
-        if (!scheduled)
+        if (!scheduled_)
         {
-          eventScheduler_->registerEvent(currentTimeLine,hashId_);
-          info(100)<<"Context id "<<context_->getId()<<"Schedule event : "<< currentTimeLine <<"  "<<hashId_<<endl ;
-          scheduled=true;
+          eventScheduler_->registerEvent(currentTimeLine_,hashId_);
+          info(100)<<"Context id "<<context_->getId()<<"Schedule event : "<< currentTimeLine_ <<"  "<<hashId_<<endl ;
+          scheduled_=true;
         }
-        else if (eventScheduler_->queryEvent(currentTimeLine,hashId_) )
+        else if (eventScheduler_->queryEvent(currentTimeLine_,hashId_) )
         {
           if (!enableEventsProcessing && isCollectiveEvent(*event)) return ;
@@ -353 +353 @@
             int typeId, classId, typeId_in, classId_in;
             long long timeLine_out;
-            long long timeLine_in( currentTimeLine );
+            long long timeLine_in( currentTimeLine_ );
             typeId_in=event->type ;
             classId_in=event->classId ;
@@ -360 +360 @@
             MPI_Allreduce(&typeId_in,&typeId, 1, MPI_INT, MPI_SUM, intraComm_) ;
             MPI_Allreduce(&classId_in,&classId, 1, MPI_INT, MPI_SUM, intraComm_) ;
-            if (typeId/intraCommSize_!=event->type || classId/intraCommSize_!=event->classId || timeLine_out/intraCommSize_!=currentTimeLine)
+            if (typeId/intraCommSize_!=event->type || classId/intraCommSize_!=event->classId || timeLine_out/intraCommSize_!=currentTimeLine_)
             {
                ERROR("void CLegacyContextClient::sendEvent(CEventClient& event)",
-                  << "Event are not coherent between client for timeline = "<<currentTimeLine);
+                  << "Event are not coherent between client for timeline = "<<currentTimeLine_);
             }
           }
@@ -369 +369 @@
           isProcessingEvent_=true ;
           CTimer::get("Process events").resume();
-          info(100)<<"Context id "<<context_->getId()<<" : Process Event "<<currentTimeLine<<" of class "<<event->classId<<" of type "<<event->type<<endl ;
+          info(100)<<"Context id "<<context_->getId()<<" : Process Event "<<currentTimeLine_<<" of class "<<event->classId<<" of type "<<event->type<<endl ;
           eventScheduler_->popEvent() ;
           dispatchEvent(*event);
           CTimer::get("Process events").suspend();
           isProcessingEvent_=false ;
-          pendingEvent=false;
+          pendingEvent_=false;
           delete event;
-          events.erase(it);
-          currentTimeLine++;
-          scheduled = false;
+          events_.erase(it);
+          currentTimeLine_++;
+          scheduled_ = false;
         }
       }
-      else if (pendingRequest.empty()) getBufferFromClient(currentTimeLine) ;
-    }
-    else if (pendingRequest.empty()) getBufferFromClient(currentTimeLine) ; // if pure one sided check buffer even if no event recorded at current time line
+      else if (pendingRequest_.empty()) getBufferFromClient(currentTimeLine_) ;
+    }
+    else if (pendingRequest_.empty()) getBufferFromClient(currentTimeLine_) ; // if pure one sided check buffer even if no event recorded at current time line
   }
 
@@ -389 +389 @@
   {
     map<int,CServerBuffer*>::iterator it;
-    for(it=buffers.begin();it!=buffers.end();++it) delete it->second;
-    buffers.clear() ;
+    for(it=buffers_.begin();it!=buffers_.end();++it) delete it->second;
+    buffers_.clear() ;
   }
 
   void CLegacyContextServerV2::releaseBuffers()
   {
-    //for(auto it=buffers.begin();it!=buffers.end();++it) delete it->second ;
-    //buffers.clear() ; 
+    //for(auto it=buffers_.begin();it!=buffers_.end();++it) delete it->second ;
+    //buffers_.clear() ; 
     freeWindows() ;
   }
@@ -412 +412 @@
   void CLegacyContextServerV2::notifyClientsFinalize(void)
   {
-    for(auto it=buffers.begin();it!=buffers.end();++it)
+    for(auto it=buffers_.begin();it!=buffers_.end();++it)
     {
       it->second->notifyClientFinalize() ;
@@ -432 +432 @@
     {
       if (info.isActive(logProfile)) CTimer::get("Context finalize").resume();
-      finished=true;
+      finished_=true;
       info(20)<<" CLegacyContextServerV2: Receive context <"<<context_->getId()<<"> finalize."<<endl;
       notifyClientsFinalize() ;

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/transport/legacy_context_server_v2.hpp

@@ -42 +42 @@
     MPI_Comm commSelf_ ; //!< Communicator for proc alone from interCommMerged 
 
-    map<int,CServerBuffer*> buffers ;
-    map<int,size_t> lastTimeLine ; //!< last event time line for a processed request
-    map<int,size_t>::iterator itLastTimeLine ; //!< iterator on lastTimeLine
-    map<int, list<std::pair<MPI_Message,MPI_Status> > > pendingProbe;
-    map<int,MPI_Request> pendingRequest ;
-    map<int,char*> bufferRequest ;
+    map<int,CServerBuffer*> buffers_ ;
+    map<int,size_t> lastTimeLine_ ; //!< last event time line for a processed request
+    map<int,size_t>::iterator itLastTimeLine_ ; //!< iterator on lastTimeLine
+    map<int, list<std::pair<MPI_Message,MPI_Status> > > pendingProbe_;
+    map<int,MPI_Request> pendingRequest_ ;
+    map<int,char*> bufferRequest_ ;
 
-    map<size_t,CEventServer*> events ;
-    size_t currentTimeLine ;
+    map<size_t,CEventServer*> events_ ;
+    size_t currentTimeLine_ ;
       
-    bool finished ;
-    bool pendingEvent ;
-    bool scheduled  ;    /*!< event of current timeline is alreading scheduled ? */
-    bool pureOneSided ; //!< if true, client will communicated with servers only trough one sided communication. Otherwise the hybrid mode P2P /One sided is used.
+    bool finished_ ;
+    bool pendingEvent_ ;
+    bool scheduled_  ;    /*!< event of current timeline is alreading scheduled ? */
+    bool pureOneSided_ ; //!< if true, client will communicated with servers only trough one sided communication. Otherwise the hybrid mode P2P /One sided is used.
 
     ~CLegacyContextServerV2() ;

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/transport/one_sided_context_client.cpp

@@ -25 +25 @@
     COneSidedContextClient::COneSidedContextClient(CContext* parent, MPI_Comm intraComm, MPI_Comm interComm, CContext* cxtSer)
      : CContextClient(parent, intraComm, interComm, cxtSer),
-       mapBufferSize_(), maxBufferedEvents(4)
+       mapBufferSize_(), maxBufferedEvents_(4)
     {
       
-      pureOneSided=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
+      pureOneSided_=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
 
       xios::MPI_Intercomm_merge(interComm_,false, &interCommMerged_) ;
@@ -36 +36 @@
       CXios::getMpiGarbageCollector().registerCommunicator(commSelf_) ;
       eventScheduler_ = parent->getEventScheduler() ;  
-      timeLine = 1;
+      timeLine_ = 1;
     }
 
@@ -50 +50 @@
 //      ostringstream str ;
 //      for(auto& rank : ranks) str<<rank<<" ; " ;
-//      info(100)<<"Event "<<timeLine<<" of context "<<context_->getId()<<"  for ranks : "<<str.str()<<endl ;
+//      info(100)<<"Event "<<timeLine_<<" of context "<<context_->getId()<<"  for ranks : "<<str.str()<<endl ;
 
       if (CXios::checkEventSync)
@@ -56 +56 @@
         int typeId, classId, typeId_in, classId_in;
         long long timeLine_out;
-        long long timeLine_in( timeLine );
+        long long timeLine_in( timeLine_ );
         typeId_in=event.getTypeId() ;
         classId_in=event.getClassId() ;
-//        MPI_Allreduce(&timeLine,&timeLine_out, 1, MPI_UINT64_T, MPI_SUM, intraComm_) ; // MPI_UINT64_T standardized by MPI 3
+//        MPI_Allreduce(&timeLine_,&timeLine_out, 1, MPI_UINT64_T, MPI_SUM, intraComm_) ; // MPI_UINT64_T standardized by MPI 3
         MPI_Allreduce(&timeLine_in,&timeLine_out, 1, MPI_LONG_LONG_INT, MPI_SUM, intraComm_) ; 
         MPI_Allreduce(&typeId_in,&typeId, 1, MPI_INT, MPI_SUM, intraComm_) ;
         MPI_Allreduce(&classId_in,&classId, 1, MPI_INT, MPI_SUM, intraComm_) ;
-        if (typeId/clientSize_!=event.getTypeId() || classId/clientSize_!=event.getClassId() || timeLine_out/clientSize_!=timeLine)
+        if (typeId/clientSize_!=event.getTypeId() || classId/clientSize_!=event.getClassId() || timeLine_out/clientSize_!=timeLine_)
         {
            ERROR("void COneSidedContextClient::sendEvent(CEventClient& event)",
-               << "Event are not coherent between client for timeline = "<<timeLine);
+               << "Event are not coherent between client for timeline = "<<timeLine_);
         }
         
@@ -78 +78 @@
         {
           ERROR("void COneSidedContextClient::sendEvent(CEventClient& event)",
-                 <<" Some servers will not receive the message for timeline = "<<timeLine<<endl
+                 <<" Some servers will not receive the message for timeline = "<<timeLine_<<endl
                  <<"Servers are : "<<osstr.str()) ;
         }
@@ -97 +97 @@
         itBuffer->second->eventLoop() ;
         double time=CTimer::getTime() ;
-        bool succed = itBuffer->second->writeEvent(timeLine, event)  ;
+        bool succed = itBuffer->second->writeEvent(timeLine_, event)  ;
         if (succed) 
         {
@@ -117 +117 @@
       synchronize() ;
       
-      timeLine++;
+      timeLine_++;
     }
 
@@ -160 +160 @@
         error(0) << "WARNING: Unexpected request for buffer to communicate with server " << rank << std::endl;
         mapBufferSize_[rank] = CXios::minBufferSize;
-        maxEventSizes[rank] = CXios::minBufferSize;
+        maxEventSizes_[rank] = CXios::minBufferSize;
       }
 

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/transport/one_sided_context_client.hpp

@@ -57 +57 @@
       void setFixedBuffer(void) { isGrowableBuffer_=false;}
 
-      size_t timeLine; //!< Timeline of each event
+      size_t timeLine_; //!< Timeline of each event
 
       MPI_Comm interCommMerged_; //!< Communicator of the client group + server group (intraCommunicator) needed for one sided communication.
@@ -63 +63 @@
       map<int,COneSidedClientBuffer*> buffers; //!< Buffers for connection to servers
 
-      bool pureOneSided ; //!< if true, client will communicated with servers only trough one sided communication. Otherwise the hybrid mode P2P /One sided is used.
+      bool pureOneSided_ ; //!< if true, client will communicated with servers only trough one sided communication. Otherwise the hybrid mode P2P /One sided is used.
 
     private:
@@ -70 +70 @@
       std::map<int,StdSize> mapBufferSize_;
       //! Maximum event sizes estimated for each connection to server
-      std::map<int,StdSize> maxEventSizes;
+      std::map<int,StdSize> maxEventSizes_;
       //! Maximum number of events that can be buffered
-      StdSize maxBufferedEvents;
+      StdSize maxBufferedEvents_;
 
       std::map<int, MPI_Comm> winComm_ ; //! Window communicators

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/transport/one_sided_context_server.cpp

@@ -40 +40 @@
     CXios::getMpiGarbageCollector().registerCommunicator(processEventBarrier_) ;
     
-    currentTimeLine=1;
-    scheduled=false;
-    finished=false;
+    currentTimeLine_=1;
+    scheduled_=false;
+    finished_=false;
 
     xios::MPI_Intercomm_merge(interComm_,true,&interCommMerged_) ;
@@ -49 +49 @@
     CXios::getMpiGarbageCollector().registerCommunicator(commSelf_) ;
 
-    itLastTimeLine=lastTimeLine.begin() ;
-
-    pureOneSided=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
+    itLastTimeLine_=lastTimeLine_.begin() ;
+
+    pureOneSided_=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
       
   }
@@ -57 +57 @@
   void COneSidedContextServer::setPendingEvent(void)
   {
-    pendingEvent=true;
+    pendingEvent_=true;
   }
 
@@ -67 +67 @@
   bool COneSidedContextServer::hasFinished(void)
   {
-    return finished;
+    return finished_;
   }
 
@@ -87 +87 @@
     processEvents(enableEventsProcessing);
     if (info.isActive(logTimers)) CTimer::get("check event process").suspend();
-    return finished;
+    return finished_;
 
   }
@@ -170 +170 @@
     if (isProcessingEvent_) return ;
 
-    auto it=completedEvents_.find(currentTimeLine);
+    auto it=completedEvents_.find(currentTimeLine_);
 
     if (it!=completedEvents_.end())
@@ -176 +176 @@
       if (it->second.nbSenders == it->second.currentNbSenders)
       {
-        if (!scheduled) 
+        if (!scheduled_) 
         {
-          eventScheduler_->registerEvent(currentTimeLine,hashId_);
-          scheduled=true;
+          eventScheduler_->registerEvent(currentTimeLine_,hashId_);
+          scheduled_=true;
         }
-        else if (eventScheduler_->queryEvent(currentTimeLine,hashId_) )
+        else if (eventScheduler_->queryEvent(currentTimeLine_,hashId_) )
         {
           //if (!enableEventsProcessing && isCollectiveEvent(event)) return ;
@@ -204 +204 @@
           isProcessingEvent_=true ;
           CEventServer event(this) ;
-          for(auto& buffer : it->second.buffers) buffer->fillEventServer(currentTimeLine, event) ;
+          for(auto& buffer : it->second.buffers) buffer->fillEventServer(currentTimeLine_, event) ;
 //          MPI_Barrier(intraComm) ;
           CTimer::get("Process events").resume();
-          info(100)<<"Context id "<<context_->getId()<<" : Process Event "<<currentTimeLine<<" of class "<<event.classId<<" of type "<<event.type<<endl ;
+          info(100)<<"Context id "<<context_->getId()<<" : Process Event "<<currentTimeLine_<<" of class "<<event.classId<<" of type "<<event.type<<endl ;
           dispatchEvent(event);
           CTimer::get("Process events").suspend();
           isProcessingEvent_=false ;
 //         context_->unsetProcessingEvent() ;
-          pendingEvent=false;
+          pendingEvent_=false;
           completedEvents_.erase(it);
-          currentTimeLine++;
-          scheduled = false;
+          currentTimeLine_++;
+          scheduled_ = false;
         }
       }
@@ -267 +267 @@
     {
       if (info.isActive(logProfile)) CTimer::get("Context finalize").resume();
-      finished=true;
+      finished_=true;
       info(20)<<" COneSidedContextServer: Receive context <"<<context_->getId()<<"> finalize."<<endl;
       notifyClientsFinalize() ;

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/transport/one_sided_context_server.hpp

@@ -80 +80 @@
 
     map<int,COneSidedServerBuffer*> buffers_ ;
-    map<int,size_t> lastTimeLine ; //!< last event time line for a processed request
-    map<int,size_t>::iterator itLastTimeLine ; //!< iterator on lastTimeLine
-    map<int, list<std::pair<MPI_Message,MPI_Status> > > pendingProbe;
-    map<int,MPI_Request> pendingRequest ;
-    map<int,char*> bufferRequest ;
+    map<int,size_t> lastTimeLine_ ; //!< last event time line for a processed request
+    map<int,size_t>::iterator itLastTimeLine_ ; //!< iterator on lastTimeLine
+    map<int, list<std::pair<MPI_Message,MPI_Status> > > pendingProbe_;
+    map<int,MPI_Request> pendingRequest_ ;
+    map<int,char*> bufferRequest_ ;
 
-    map<size_t,CEventServer*> events ;
-    size_t currentTimeLine ;
+    map<size_t,CEventServer*> events_ ;
+    size_t currentTimeLine_ ;
       
-    bool finished ;
-    bool pendingEvent ;
-    bool scheduled  ;    /*!< event of current timeline is alreading scheduled ? */
-    bool pureOneSided ; //!< if true, client will communicated with servers only trough one sided communication. Otherwise the hybrid mode P2P /One sided is used.
+    bool finished_ ;
+    bool pendingEvent_ ;
+    bool scheduled_  ;    /*!< event of current timeline is alreading scheduled ? */
+    bool pureOneSided_ ; //!< if true, client will communicated with servers only trough one sided communication. Otherwise the hybrid mode P2P /One sided is used.
 
     private:

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/transport/p2p_context_client.cpp

@@ -25 +25 @@
     CP2pContextClient::CP2pContextClient(CContext* parent, MPI_Comm intraComm, MPI_Comm interComm, CContext* cxtSer)
      : CContextClient(parent, intraComm, interComm, cxtSer),
-       mapBufferSize_(), maxBufferedEvents(4)
+       mapBufferSize_(), maxBufferedEvents_(4)
     {
       
-      pureOneSided=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
+      pureOneSided_=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
 
       xios::MPI_Intercomm_merge(interComm_,false, &interCommMerged_) ;
@@ -36 +36 @@
       CXios::getMpiGarbageCollector().registerCommunicator(commSelf_) ;
       eventScheduler_ = parent->getEventScheduler() ;  
-      timeLine = 1;
+      timeLine_ = 1;
     }
 
@@ -50 +50 @@
 //      ostringstream str ;
 //      for(auto& rank : ranks) str<<rank<<" ; " ;
-//      info(100)<<"Event "<<timeLine<<" of context "<<context_->getId()<<"  for ranks : "<<str.str()<<endl ;
+//      info(100)<<"Event "<<timeLine_<<" of context "<<context_->getId()<<"  for ranks : "<<str.str()<<endl ;
 
       if (CXios::checkEventSync)
@@ -56 +56 @@
         int typeId, classId, typeId_in, classId_in;
         long long timeLine_out;
-        long long timeLine_in( timeLine );
+        long long timeLine_in( timeLine_ );
         typeId_in=event.getTypeId() ;
         classId_in=event.getClassId() ;
-//        MPI_Allreduce(&timeLine,&timeLine_out, 1, MPI_UINT64_T, MPI_SUM, intraComm_) ; // MPI_UINT64_T standardized by MPI 3
+//        MPI_Allreduce(&timeLine_,&timeLine_out, 1, MPI_UINT64_T, MPI_SUM, intraComm_) ; // MPI_UINT64_T standardized by MPI 3
         MPI_Allreduce(&timeLine_in,&timeLine_out, 1, MPI_LONG_LONG_INT, MPI_SUM, intraComm_) ; 
         MPI_Allreduce(&typeId_in,&typeId, 1, MPI_INT, MPI_SUM, intraComm_) ;
         MPI_Allreduce(&classId_in,&classId, 1, MPI_INT, MPI_SUM, intraComm_) ;
-        if (typeId/clientSize_!=event.getTypeId() || classId/clientSize_!=event.getClassId() || timeLine_out/clientSize_!=timeLine)
+        if (typeId/clientSize_!=event.getTypeId() || classId/clientSize_!=event.getClassId() || timeLine_out/clientSize_!=timeLine_)
         {
            ERROR("void COneSidedContextClient::sendEvent(CEventClient& event)",
-               << "Event are not coherent between client for timeline = "<<timeLine);
+               << "Event are not coherent between client for timeline = "<<timeLine_);
         }
         
@@ -78 +78 @@
         {
           ERROR("void COneSidedContextClient::sendEvent(CEventClient& event)",
-                 <<" Some servers will not receive the message for timeline = "<<timeLine<<endl
+                 <<" Some servers will not receive the message for timeline = "<<timeLine_<<endl
                  <<"Servers are : "<<osstr.str()) ;
         }
@@ -89 +89 @@
       {
         int rank=event.getRank() ;
-        auto itBuffer=buffers.find(rank) ;
-        if (itBuffer==buffers.end()) 
+        auto itBuffer=buffers_.find(rank) ;
+        if (itBuffer==buffers_.end()) 
         {  
           newBuffer(rank) ;
-          itBuffer=buffers.find(rank) ;
+          itBuffer=buffers_.find(rank) ;
         }
         itBuffer->second->eventLoop() ;
         double time=CTimer::getTime() ;
-        bool succed = itBuffer->second->writeEvent(timeLine, event)  ;
+        bool succed = itBuffer->second->writeEvent(timeLine_, event)  ;
         if (succed) 
         {
@@ -117 +117 @@
       synchronize() ;
       
-      timeLine++;
+      timeLine_++;
     }
 
@@ -163 +163 @@
       }
 
-      CP2pClientBuffer* buffer = buffers[rank] = new CP2pClientBuffer(interComm_, rank, commSelf_, interCommMerged_, clientSize_+rank );
+      CP2pClientBuffer* buffer = buffers_[rank] = new CP2pClientBuffer(interComm_, rank, commSelf_, interCommMerged_, clientSize_+rank );
       if (isGrowableBuffer_) { buffer->setGrowable(growingFactor_) ; }
       else buffer->setFixed(mapBufferSize_[rank]) ;
@@ -176 +176 @@
    {
       bool pending = false;
-      for (auto itBuff : buffers)
+      for (auto itBuff : buffers_)
       {
         itBuff.second->eventLoop() ;
@@ -187 +187 @@
    void CP2pContextClient::releaseBuffers()
    {
-      for (auto& itBuff : buffers) delete itBuff.second;
-      buffers.clear();
+      for (auto& itBuff : buffers_) delete itBuff.second;
+      buffers_.clear();
    }
 
@@ -202 +202 @@
       for (auto& rank : ranks) 
       {
-        buffers[rank]->eventLoop() ;
-        pending |= !(buffers[rank]->isEmpty()) ;
+        buffers_[rank]->eventLoop() ;
+        pending |= !(buffers_[rank]->isEmpty()) ;
       }
       return pending;
@@ -221 +221 @@
       size_t size=std::max(CXios::minBufferSize*1.0,std::min(it.second*CXios::bufferSizeFactor*1.01,CXios::maxBufferSize*1.0)) ;
       mapBufferSize_[it.first]=size ;
-      if (buffers.count(it.first)>0) buffers[it.first]->setFixed(size);
+      if (buffers_.count(it.first)>0) buffers_[it.first]->setFixed(size);
      }
    }
@@ -236 +236 @@
     int* nbServerConnectionGlobal  = new int[serverSize_] ;
     for(int i=0;i<serverSize_;++i) nbServerConnectionLocal[i]=0 ;
-    for (auto itBuff = buffers.begin(); itBuff != buffers.end(); itBuff++)  nbServerConnectionLocal[itBuff->first]=1 ;
+    for (auto itBuff = buffers_.begin(); itBuff != buffers_.end(); itBuff++)  nbServerConnectionLocal[itBuff->first]=1 ;
     for (auto ItServerLeader = ranksServerLeader_.begin(); ItServerLeader != ranksServerLeader_.end(); ItServerLeader++)  nbServerConnectionLocal[*ItServerLeader]=1 ;
     
@@ -286 +286 @@
 
     bool finalized = true;
-    for (auto& it : buffers ) finalized &= it.second->isNotifiedFinalized();
+    for (auto& it : buffers_ ) finalized &= it.second->isNotifiedFinalized();
     return finalized;
   }

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/transport/p2p_context_client.hpp

@@ -57 +57 @@
       void setFixedBuffer(void) { isGrowableBuffer_=false;}
 
-      size_t timeLine; //!< Timeline of each event
+      size_t timeLine_; //!< Timeline of each event
 
       MPI_Comm interCommMerged_; //!< Communicator of the client group + server group (intraCommunicator) needed for one sided communication.
       MPI_Comm commSelf_ ; //!< Communicator for proc alone from interCommMerged 
-      map<int,CP2pClientBuffer*> buffers; //!< Buffers for connection to servers
+      map<int,CP2pClientBuffer*> buffers_; //!< Buffers for connection to servers
 
-      bool pureOneSided ; //!< if true, client will communicated with servers only trough one sided communication. Otherwise the hybrid mode P2P /One sided is used.
+      bool pureOneSided_ ; //!< if true, client will communicated with servers only trough one sided communication. Otherwise the hybrid mode P2P /One sided is used.
 
     private:
@@ -72 +72 @@
       std::map<int,StdSize> maxEventSizes;
       //! Maximum number of events that can be buffered
-      StdSize maxBufferedEvents;
+      StdSize maxBufferedEvents_;
 
       std::map<int, MPI_Comm> winComm_ ; //! Window communicators

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/transport/p2p_context_server.cpp

@@ -40 +40 @@
     CXios::getMpiGarbageCollector().registerCommunicator(processEventBarrier_) ;
     
-    currentTimeLine=1;
-    scheduled=false;
-    finished=false;
+    currentTimeLine_=1;
+    scheduled_=false;
+    finished_=false;
 
     xios::MPI_Intercomm_merge(interComm_,true,&interCommMerged_) ;
@@ -49 +49 @@
     CXios::getMpiGarbageCollector().registerCommunicator(commSelf_) ;
     
-    itLastTimeLine=lastTimeLine.begin() ;
-
-    pureOneSided=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
+    itLastTimeLine_=lastTimeLine_.begin() ;
+
+    pureOneSided_=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
       
   }
@@ -57 +57 @@
   void CP2pContextServer::setPendingEvent(void)
   {
-    pendingEvent=true;
+    pendingEvent_=true;
   }
 
@@ -67 +67 @@
   bool CP2pContextServer::hasFinished(void)
   {
-    return finished;
+    return finished_;
   }
 
@@ -89 +89 @@
     if (info.isActive(logTimers)) CTimer::get("check event process").suspend();
     if (info.isActive(logProfile)) CTimer::get("Recv event loop (p2p)").suspend();
-    return finished;
+    return finished_;
 
   }
@@ -176 +176 @@
     if (isProcessingEvent_) return ;
 
-    auto it=completedEvents_.find(currentTimeLine);
+    auto it=completedEvents_.find(currentTimeLine_);
 
     if (it!=completedEvents_.end())
@@ -182 +182 @@
       if (it->second.nbSenders == it->second.currentNbSenders)
       {
-        if (!scheduled) 
+        if (!scheduled_) 
         {
-          eventScheduler_->registerEvent(currentTimeLine,hashId_);
-          scheduled=true;
+          eventScheduler_->registerEvent(currentTimeLine_,hashId_);
+          scheduled_=true;
         }
-        else if (eventScheduler_->queryEvent(currentTimeLine,hashId_) )
+        else if (eventScheduler_->queryEvent(currentTimeLine_,hashId_) )
         {
           //if (!enableEventsProcessing && isCollectiveEvent(event)) return ;
@@ -210 +210 @@
           isProcessingEvent_=true ;
           CEventServer event(this) ;
-          for(auto& buffer : it->second.buffers) buffer->fillEventServer(currentTimeLine, event) ;
+          for(auto& buffer : it->second.buffers) buffer->fillEventServer(currentTimeLine_, event) ;
 //          MPI_Barrier(intraComm) ;
           CTimer::get("Process events").resume();
-          info(100)<<"Context id "<<context_->getId()<<" : Process Event "<<currentTimeLine<<" of class "<<event.classId<<" of type "<<event.type<<endl ;
+          info(100)<<"Context id "<<context_->getId()<<" : Process Event "<<currentTimeLine_<<" of class "<<event.classId<<" of type "<<event.type<<endl ;
           dispatchEvent(event);
           CTimer::get("Process events").suspend();
           isProcessingEvent_=false ;
 //         context_->unsetProcessingEvent() ;
-          pendingEvent=false;
+          pendingEvent_=false;
           completedEvents_.erase(it);
-          currentTimeLine++;
-          scheduled = false;
+          currentTimeLine_++;
+          scheduled_ = false;
         }
       }
@@ -273 +273 @@
     {
       CTimer::get("Context finalize").resume();
-      finished=true;
+      finished_=true;
       info(20)<<" CP2pContextServer: Receive context <"<<context_->getId()<<"> finalize."<<endl;
       notifyClientsFinalize() ;

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/transport/p2p_context_server.hpp

@@ -80 +80 @@
 
     map<int,CP2pServerBuffer*> buffers_ ;
-    map<int,size_t> lastTimeLine ; //!< last event time line for a processed request
-    map<int,size_t>::iterator itLastTimeLine ; //!< iterator on lastTimeLine
-    map<int, list<std::pair<MPI_Message,MPI_Status> > > pendingProbe;
-    map<int,MPI_Request> pendingRequest ;
-    map<int,char*> bufferRequest ;
+    map<int,size_t> lastTimeLine_ ; //!< last event time line for a processed request
+    map<int,size_t>::iterator itLastTimeLine_ ; //!< iterator on lastTimeLine
+    map<int, list<std::pair<MPI_Message,MPI_Status> > > pendingProbe_;
+    map<int,MPI_Request> pendingRequest_ ;
+    map<int,char*> bufferRequest_ ;
 
-    map<size_t,CEventServer*> events ;
-    size_t currentTimeLine ;
+    map<size_t,CEventServer*> events_ ;
+    size_t currentTimeLine_ ;
       
-    bool finished ;
-    bool pendingEvent ;
-    bool scheduled  ;    /*!< event of current timeline is alreading scheduled ? */
-    bool pureOneSided ; //!< if true, client will communicated with servers only trough one sided communication. Otherwise the hybrid mode P2P /One sided is used.
+    bool finished_ ;
+    bool pendingEvent_ ;
+    bool scheduled_  ;    /*!< event of current timeline is alreading scheduled ? */
+    bool pureOneSided_ ; //!< if true, client will communicated with servers only trough one sided communication. Otherwise the hybrid mode P2P /One sided is used.
 
     private: