Changeset 1764 for XIOS/dev/dev_ym/XIOS_SERVICES/src/manager/services.cpp

Timestamp:

11/05/19 16:02:34 (5 years ago)

Author:

ymipsl

Message:

Some Update on XIOS services
Seems to work on Irène for :

• first level of servers
• fisrt + second level of servers
• attached mode

YM

File:

• XIOS/dev/dev_ym/XIOS_SERVICES/src/manager/services.cpp (modified) (6 diffs)

XIOS/dev/dev_ym/XIOS_SERVICES/src/manager/services.cpp

@@ -10 +10 @@
   CService::CService(MPI_Comm serviceComm, const std::string& poolId, const std::string& serviceId, const int& partitionId, 
                      int type, int nbPartitions) : finalizeSignal_(false), eventScheduler_(nullptr), poolId_(poolId), serviceId_(serviceId),
-                                                   partitionId_(partitionId), type_(type), nbPartitions_(nbPartitions)
+                                                   partitionId_(partitionId), type_(type), nbPartitions_(nbPartitions), hasNotification_(false)
 
 
@@ -34 +34 @@
     }
     eventScheduler_ = new CEventScheduler(serviceComm_) ;
+
+    ostringstream oss;
+    oss<<partitionId;
+    name_= poolId+"::"+serviceId+"_"+oss.str();
   }
 
@@ -41 +45 @@
     MPI_Comm_size(serviceComm_, &commSize) ;
     
-    for(int rank=0; rank<commSize; rank++) createContextNotify(rank, poolId, serviceId, partitionId, contextId) ;
+    for(int rank=0; rank<commSize; rank++) 
+    {
+      notifyOutType_=NOTIFY_CREATE_CONTEXT ;
+      notifyOutCreateContext_ = make_tuple(poolId, serviceId, partitionId, contextId) ;
+      sendNotification(rank) ;
+    }
   }
 /*
@@ -87 +96 @@
   }
 
-  bool CService::eventLoop(void)
-  {
-    checkCreateContextNotification() ;
+  bool CService::eventLoop(bool serviceOnly)
+  {
+    //checkCreateContextNotification() ;
+    checkNotifications() ;
+
     eventScheduler_->checkEvent() ;
     for(auto it=contexts_.begin();it!=contexts_.end();++it) 
     {
-      if (it->second->eventLoop())
+      if (it->second->eventLoop(serviceOnly))
       {
         contexts_.erase(it) ;
@@ -105 +116 @@
   }
 
+  void CService::sendNotification(int rank)
+  {
+    winNotify_->lockWindow(rank,0) ;
+    winNotify_->pushToWindow(rank, this, &CService::notificationsDumpOut) ;
+    winNotify_->unlockWindow(rank,0) ;
+  }
+
+  
+  void CService::notificationsDumpOut(CBufferOut& buffer)
+  {
+    
+    buffer.realloc(maxBufferSize_) ;
+    
+    if (notifyOutType_==NOTIFY_CREATE_CONTEXT)
+    {
+      auto& arg=notifyOutCreateContext_ ;
+      buffer << notifyOutType_ << std::get<0>(arg)<<std::get<1>(arg) << std::get<2>(arg)<<std::get<3>(arg) ;
+    }
+  }
+
+  void CService::notificationsDumpIn(CBufferIn& buffer)
+  {
+    if (buffer.bufferSize() == 0) notifyInType_= NOTIFY_NOTHING ;
+    else
+    {
+      buffer>>notifyInType_;
+      if (notifyInType_==NOTIFY_CREATE_CONTEXT)
+      {
+        info(10)<<"NotifyDumpOut"<<endl ;
+        auto& arg=notifyInCreateContext_ ;
+        buffer >> std::get<0>(arg)>> std::get<1>(arg) >> std::get<2>(arg)>> std::get<3>(arg);
+      }
+    }
+  }
+
+
+
+
+  void CService::checkNotifications(void)
+  {
+    if (!hasNotification_)
+    {
+      int commRank ;
+      MPI_Comm_rank(serviceComm_, &commRank) ;
+      winNotify_->lockWindow(commRank,0) ;
+      winNotify_->popFromWindow(commRank, this, &CService::notificationsDumpIn) ;
+      winNotify_->unlockWindow(commRank,0) ;
+      
+      if (notifyInType_!= NOTIFY_NOTHING)
+      {
+        hasNotification_=true ;
+        std::hash<string> hashString ;
+        size_t hashId = hashString(name_) ;
+        size_t currentTimeLine=0 ;
+        eventScheduler_->registerEvent(currentTimeLine,hashId); 
+      }
+    }
+    
+    if (hasNotification_)
+    {
+      std::hash<string> hashString ;
+      size_t hashId = hashString(name_) ;
+      size_t currentTimeLine=0 ;
+      if (eventScheduler_->queryEvent(currentTimeLine,hashId))
+      {
+        if (notifyInType_==NOTIFY_CREATE_CONTEXT) createContext() ;
+        hasNotification_=false ;
+      }
+    }
+  }
+
+
+
+
   void CService::checkCreateContextNotification(void)
   {
@@ -122 +207 @@
   }
 
+  void CService::createContext(void)
+   {
+     auto& arg=notifyInCreateContext_ ;
+     string poolId = get<0>(arg) ;
+     string& serviceId = get<1>(arg) ;
+     int partitionId = get<2>(arg) ;
+     string contextId = get<3>(arg) ;
+     contexts_[contextId] = new CServerContext(this, serviceComm_, poolId, serviceId, partitionId, contextId) ; 
+   }
+
+   //to remove
    void CService::createNewContext(const std::string& poolId, const std::string& serviceId, const int& partitionId, const std::string& contextId)
    {